Mercurial > hg > nginx-vendor-1-0
diff src/os/unix/ngx_freebsd_sendfile_chain.c @ 50:72eb30262aac NGINX_0_1_25
nginx 0.1.25
*) Bugfix: nginx did run on Linux parisc.
*) Feature: nginx now does not start under FreeBSD if the sysctl
kern.ipc.somaxconn value is too big.
*) Bugfix: if a request was internally redirected by the
ngx_http_index_module module to the ngx_http_proxy_module or
ngx_http_fastcgi_module modules, then the index file was not closed
after request completion.
*) Feature: the "proxy_pass" can be used in location with regular
expression.
*) Feature: the ngx_http_rewrite_filter_module module supports the
condition like "if ($HTTP_USER_AGENT ~ MSIE)".
*) Bugfix: nginx started too slow if the large number of addresses and
text values were used in the "geo" directive.
*) Change: a variable name must be declared as "$name" in the "geo"
directive. The previous variant without "$" is still supported, but
will be removed soon.
*) Feature: the "%{VARIABLE}v" logging parameter.
*) Feature: the "set $name value" directive.
*) Bugfix: gcc 4.0 compatibility.
*) Feature: the --with-openssl-opt=OPTIONS autoconfiguration directive.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Sat, 19 Mar 2005 00:00:00 +0300 |
parents | da8c190bdaba |
children | 962c43960644 |
line wrap: on
line diff
--- a/src/os/unix/ngx_freebsd_sendfile_chain.c +++ b/src/os/unix/ngx_freebsd_sendfile_chain.c @@ -21,19 +21,19 @@ * to postpone the sending - it not only sends a header and the first part of * the file in one packet, but also sends the file pages in the full packets. * - * But until FreeBSD 4.5 the turning TCP_NOPUSH off does not flush a pending - * data that less than MSS so that data may be sent with 5 second delay. - * So we do not use TCP_NOPUSH on FreeBSD prior to 4.5 although it can be used + * But until FreeBSD 4.5 turning TCP_NOPUSH off does not flush a pending + * data that less than MSS, so that data may be sent with 5 second delay. + * So we do not use TCP_NOPUSH on FreeBSD prior to 4.5, although it can be used * for non-keepalive HTTP connections. */ #define NGX_HEADERS 8 -#define NGX_TRAILERS 4 +#define NGX_TRAILERS 8 -ngx_chain_t *ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, - off_t limit) +ngx_chain_t * +ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) { int rc; u_char *prev; @@ -123,7 +123,8 @@ ngx_chain_t *ngx_freebsd_sendfile_chain( iov->iov_len += (size_t) size; } else { - if (!(iov = ngx_array_push(&header))) { + iov = ngx_array_push(&header); + if (iov == NULL) { return NGX_CHAIN_ERROR; } @@ -197,7 +198,8 @@ ngx_chain_t *ngx_freebsd_sendfile_chain( iov->iov_len += (size_t) size; } else { - if (!(iov = ngx_array_push(&trailer))) { + iov = ngx_array_push(&trailer); + if (iov == NULL) { return NGX_CHAIN_ERROR; }