Mercurial > hg > nginx
diff src/os/win32/ngx_wsarecv_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 | 42d11f017717 |
children | 4d9ea73a627a |
line wrap: on
line diff
--- a/src/os/win32/ngx_wsarecv_chain.c +++ b/src/os/win32/ngx_wsarecv_chain.c @@ -9,16 +9,21 @@ #include <ngx_event.h> -ssize_t ngx_wsarecv_chain(ngx_connection_t *c, ngx_chain_t *chain) +#define NGX_WSABUFS 8 + + +ssize_t +ngx_wsarecv_chain(ngx_connection_t *c, ngx_chain_t *chain) { int rc; u_char *prev; u_long bytes, flags; size_t size; - WSABUF *wsabuf; ngx_err_t err; - ngx_array_t io; + ngx_array_t vec; ngx_event_t *rev; + LPWSABUF wsabuf; + WSABUF wsabufs[NGX_WSABUFS]; prev = NULL; wsabuf = NULL; @@ -26,7 +31,11 @@ ssize_t ngx_wsarecv_chain(ngx_connection size = 0; bytes = 0; - ngx_init_array(io, c->pool, 10, sizeof(WSABUF), NGX_ERROR); + vec.elts = wsabufs; + vec.nelts = 0; + vec.size = sizeof(WSABUF); + vec.nalloc = NGX_WSABUFS; + vec.pool = c->pool; /* coalesce the neighbouring bufs */ @@ -35,7 +44,11 @@ ssize_t ngx_wsarecv_chain(ngx_connection wsabuf->len += chain->buf->end - chain->buf->last; } else { - ngx_test_null(wsabuf, ngx_push_array(&io), NGX_ERROR); + wsabuf = ngx_array_push(&vec); + if (wsabuf == NULL) { + return NGX_ERROR; + } + wsabuf->buf = (char *) chain->buf->last; wsabuf->len = chain->buf->end - chain->buf->last; } @@ -46,10 +59,10 @@ ssize_t ngx_wsarecv_chain(ngx_connection } ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0, - "WSARecv: %d:%d", io.nelts, wsabuf->len); + "WSARecv: %d:%d", vec.nelts, wsabuf->len); - rc = WSARecv(c->fd, io.elts, io.nelts, &bytes, &flags, NULL, NULL); + rc = WSARecv(c->fd, vec.elts, vec.nelts, &bytes, &flags, NULL, NULL); rev = c->read;