Mercurial > hg > nginx
diff src/os/win32/ngx_wsasend_chain.c @ 577:4d9ea73a627a release-0.3.10
nginx-0.3.10-RELEASE import
*) Change: the "valid_referers" directive and the "$invalid_referer"
variable were moved to the new ngx_http_referer_module from the
ngx_http_rewrite_module.
*) Change: the "$apache_bytes_sent" variable name was changed to
"$body_bytes_sent".
*) Feature: the "$sent_http_..." variables.
*) Feature: the "if" directive supports the "=" and "!=" operations.
*) Feature: the "proxy_pass" directive supports the HTTPS protocol.
*) Feature: the "proxy_set_body" directive.
*) Feature: the "post_action" directive.
*) Feature: the ngx_http_empty_gif_module.
*) Feature: the "worker_cpu_affinity" directive for Linux.
*) Bugfix: the "rewrite" directive did not unescape URI part in
redirect, now it is unescaped except the %00-%25 and %7F-%FF
characters.
*) Bugfix: nginx could not be built by the icc 9.0 compiler.
*) Bugfix: if the SSI was enabled for zero size static file, then the
chunked response was encoded incorrectly.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 15 Nov 2005 13:30:52 +0000 |
parents | d4ea69372b94 |
children | 02fb50962b11 |
line wrap: on
line diff
--- a/src/os/win32/ngx_wsasend_chain.c +++ b/src/os/win32/ngx_wsasend_chain.c @@ -48,7 +48,7 @@ ngx_wsasend_chain(ngx_connection_t *c, n vec.elts = wsabufs; vec.size = sizeof(WSABUF); - vec.nalloc = NGX_WSABUFS; + vec.nalloc = NGX_WSABUFS; vec.pool = c->pool; for ( ;; ) { @@ -187,7 +187,7 @@ ngx_overlapped_wsasend_chain(ngx_connect if (limit == 0 || limit > NGX_MAX_UINT32_VALUE - ngx_pagesize) { limit = NGX_MAX_UINT32_VALUE - ngx_pagesize; } - + /* * WSABUFs must be 4-byte aligned otherwise * WSASend() will return undocumented WSAEINVAL error. @@ -196,13 +196,13 @@ ngx_overlapped_wsasend_chain(ngx_connect vec.elts = wsabufs; vec.nelts = 0; vec.size = sizeof(WSABUF); - vec.nalloc = NGX_WSABUFS; + vec.nalloc = NGX_WSABUFS; vec.pool = c->pool; send = 0; prev = NULL; wsabuf = NULL; - + /* create the WSABUF and coalesce the neighbouring bufs */ for (cl = in; @@ -238,7 +238,7 @@ ngx_overlapped_wsasend_chain(ngx_connect ovlp = (LPWSAOVERLAPPED) &c->write->ovlp; ngx_memzero(ovlp, sizeof(WSAOVERLAPPED)); - + rc = WSASend(c->fd, vec.elts, vec.nelts, &sent, 0, ovlp, NULL); wev->complete = 0; @@ -257,7 +257,7 @@ ngx_overlapped_wsasend_chain(ngx_connect ngx_connection_error(c, err, "WSASend() failed"); return NGX_CHAIN_ERROR; } - + } else if (ngx_event_flags & NGX_USE_IOCP_EVENT) { /* @@ -293,7 +293,7 @@ ngx_overlapped_wsasend_chain(ngx_connect &sent, 0, NULL) == 0) { ngx_connection_error(c, ngx_socket_errno, "WSASend() or WSAGetOverlappedResult() failed"); - + return NGX_CHAIN_ERROR; } }