diff options
Diffstat (limited to '')
| -rw-r--r-- | src/os/win32/ngx_errno.c | 6 | ||||
| -rw-r--r-- | src/os/win32/ngx_os.h | 1 | ||||
| -rw-r--r-- | src/os/win32/ngx_win32_config.h | 5 | ||||
| -rw-r--r-- | src/os/win32/ngx_win32_init.c | 2 | ||||
| -rw-r--r-- | src/os/win32/ngx_wsasend_chain.c | 21 |
5 files changed, 29 insertions, 6 deletions
diff --git a/src/os/win32/ngx_errno.c b/src/os/win32/ngx_errno.c index 8e9280d92..268ed5261 100644 --- a/src/os/win32/ngx_errno.c +++ b/src/os/win32/ngx_errno.c @@ -43,7 +43,11 @@ static ngx_str_t wsa_errors[] = { ngx_null_string, /* 10039 */ ngx_null_string, /* 10040 */ ngx_null_string, /* 10041 */ - ngx_null_string, /* 10042 */ + + /* WSAENOPROTOOPT 10042 */ + ngx_string("An unknown, invalid, or unsupported option or level was " + "specified in a getsockopt or setsockopt call"), + ngx_null_string, /* 10043 */ ngx_null_string, /* 10044 */ ngx_null_string, /* 10045 */ diff --git a/src/os/win32/ngx_os.h b/src/os/win32/ngx_os.h index 6d720fa58..611f7ef5c 100644 --- a/src/os/win32/ngx_os.h +++ b/src/os/win32/ngx_os.h @@ -48,6 +48,7 @@ extern ngx_uint_t ngx_ncpu; extern ngx_uint_t ngx_max_wsabufs; extern ngx_int_t ngx_max_sockets; extern ngx_uint_t ngx_inherited_nonblocking; +extern ngx_uint_t ngx_tcp_nodelay_and_tcp_nopush; extern ngx_uint_t ngx_win32_version; extern ngx_fd_t ngx_stderr_fileno; diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h index c7703c29e..79cea3f4f 100644 --- a/src/os/win32/ngx_win32_config.h +++ b/src/os/win32/ngx_win32_config.h @@ -141,5 +141,10 @@ typedef uint32_t ngx_atomic_t; #define NGX_HAVE_SENDFILE 1 #endif +#ifndef NGX_HAVE_SO_SNDLOWAT +/* setsockopt(SO_SNDLOWAT) returns error WSAENOPROTOOPT */ +#define NGX_HAVE_SO_SNDLOWAT 0 +#endif + #endif /* _NGX_WIN32_CONFIG_H_INCLUDED_ */ diff --git a/src/os/win32/ngx_win32_init.c b/src/os/win32/ngx_win32_init.c index cb8c93128..2b8891321 100644 --- a/src/os/win32/ngx_win32_init.c +++ b/src/os/win32/ngx_win32_init.c @@ -13,6 +13,8 @@ ngx_uint_t ngx_ncpu; ngx_uint_t ngx_max_wsabufs; ngx_int_t ngx_max_sockets; ngx_uint_t ngx_inherited_nonblocking = 1; +ngx_uint_t ngx_tcp_nodelay_and_tcp_nopush; + ngx_fd_t ngx_stderr_fileno; diff --git a/src/os/win32/ngx_wsasend_chain.c b/src/os/win32/ngx_wsasend_chain.c index 1d75e0969..d5b1334a1 100644 --- a/src/os/win32/ngx_wsasend_chain.c +++ b/src/os/win32/ngx_wsasend_chain.c @@ -17,7 +17,7 @@ ngx_chain_t *ngx_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in, { int rc; u_char *prev; - u_long size, sent, send, sprev; + u_long size, sent, send, prev_send; ngx_uint_t complete; ngx_err_t err; ngx_event_t *wev; @@ -32,6 +32,12 @@ ngx_chain_t *ngx_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in, return in; } + /* the maximum limit size is the maximum u_long value - the page size */ + + if (limit == 0 || limit > NGX_MAX_UINT32_VALUE - ngx_pagesize) { + limit = NGX_MAX_UINT32_VALUE - ngx_pagesize; + } + send = 0; complete = 0; @@ -48,7 +54,7 @@ ngx_chain_t *ngx_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in, for ( ;; ) { prev = NULL; wsabuf = NULL; - sprev = send; + prev_send = send; vec.nelts = 0; @@ -105,7 +111,7 @@ ngx_chain_t *ngx_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in, ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0, "WSASend: fd:%d, s:%ul", c->fd, sent); - if (send - sprev == sent) { + if (send - prev_send == sent) { complete = 1; } @@ -153,8 +159,7 @@ ngx_chain_t *ngx_overlapped_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in, { int rc; u_char *prev; - size_t size; - u_long send, sent; + u_long size, send, sent; LPWSABUF wsabuf; ngx_err_t err; ngx_event_t *wev; @@ -175,6 +180,12 @@ ngx_chain_t *ngx_overlapped_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in, if (!wev->complete) { /* post the overlapped WSASend() */ + + /* the maximum limit size is the maximum u_long value - the page size */ + + if (limit == 0 || limit > NGX_MAX_UINT32_VALUE - ngx_pagesize) { + limit = NGX_MAX_UINT32_VALUE - ngx_pagesize; + } /* * WSABUFs must be 4-byte aligned otherwise |