Mercurial > hg > nginx
diff src/os/win32/ngx_wsasend_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 | 8e8f3af115b5 |
children | 4d9ea73a627a |
line wrap: on
line diff
--- a/src/os/win32/ngx_wsasend_chain.c Fri Mar 04 14:06:57 2005 +0000 +++ b/src/os/win32/ngx_wsasend_chain.c Sat Mar 19 12:38:37 2005 +0000 @@ -12,8 +12,8 @@ #define NGX_WSABUFS 8 -ngx_chain_t *ngx_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in, - off_t limit) +ngx_chain_t * +ngx_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) { int rc; u_char *prev; @@ -22,9 +22,9 @@ ngx_err_t err; ngx_event_t *wev; ngx_array_t vec; + ngx_chain_t *cl; LPWSABUF wsabuf; WSABUF wsabufs[NGX_WSABUFS]; - ngx_chain_t *cl; wev = c->write; @@ -78,7 +78,8 @@ wsabuf->len += cl->buf->last - cl->buf->pos; } else { - if (!(wsabuf = ngx_array_push(&vec))) { + wsabuf = ngx_array_push(&vec); + if (wsabuf == NULL) { return NGX_CHAIN_ERROR; } @@ -154,18 +155,18 @@ } -ngx_chain_t *ngx_overlapped_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in, - off_t limit) +ngx_chain_t * +ngx_overlapped_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) { int rc; u_char *prev; u_long size, send, sent; - LPWSABUF wsabuf; ngx_err_t err; ngx_event_t *wev; ngx_array_t vec; ngx_chain_t *cl; LPWSAOVERLAPPED ovlp; + LPWSABUF wsabuf; WSABUF wsabufs[NGX_WSABUFS]; wev = c->write; @@ -222,7 +223,8 @@ wsabuf->len += cl->buf->last - cl->buf->pos; } else { - if (!(wsabuf = ngx_array_push(&vec))) { + wsabuf = ngx_array_push(&vec); + if (wsabuf == NULL) { return NGX_CHAIN_ERROR; }