Mercurial > hg > nginx
diff src/os/unix/ngx_solaris_sendfilev_chain.c @ 501:d4ea69372b94 release-0.1.25
nginx-0.1.25-RELEASE import
*) 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 <igor@sysoev.ru> |
---|---|
date | Sat, 19 Mar 2005 12:38:37 +0000 |
parents | ad1e9ebf93bb |
children | 4d9ea73a627a |
line wrap: on
line diff
--- a/src/os/unix/ngx_solaris_sendfilev_chain.c +++ b/src/os/unix/ngx_solaris_sendfilev_chain.c @@ -47,7 +47,7 @@ ngx_chain_t *ngx_solaris_sendfilev_chain sendfilevec_t *sfv, sfvs[NGX_SENDFILEVECS]; ngx_array_t vec; ngx_event_t *wev; - ngx_chain_t *cl, *tail; + ngx_chain_t *cl; wev = c->write; @@ -107,7 +107,8 @@ ngx_chain_t *ngx_solaris_sendfilev_chain sfv->sfv_len += (size_t) size; } else { - if (!(sfv = ngx_array_push(&vec))) { + sfv = ngx_array_push(&vec); + if (sfv == NULL) { return NGX_CHAIN_ERROR; } @@ -140,7 +141,8 @@ ngx_chain_t *ngx_solaris_sendfilev_chain sfv->sfv_len += (size_t) size; } else { - if (!(sfv = ngx_array_push(&vec))) { + sfv = ngx_array_push(&vec); + if (sfv == NULL) { return NGX_CHAIN_ERROR; }