diff options
Diffstat (limited to 'src/os')
| -rw-r--r-- | src/os/win32/ngx_os.h | 9 | ||||
| -rw-r--r-- | src/os/win32/ngx_win32_config.h | 17 | ||||
| -rw-r--r-- | src/os/win32/ngx_wsasend_chain.c | 6 |
3 files changed, 26 insertions, 6 deletions
diff --git a/src/os/win32/ngx_os.h b/src/os/win32/ngx_os.h index 2fae21b84..aa66e70d3 100644 --- a/src/os/win32/ngx_os.h +++ b/src/os/win32/ngx_os.h @@ -26,7 +26,8 @@ typedef struct { ssize_t (*recv)(ngx_connection_t *c, u_char *buf, size_t size); ssize_t (*recv_chain)(ngx_connection_t *c, ngx_chain_t *in); ssize_t (*send)(ngx_connection_t *c, u_char *buf, size_t size); - ngx_chain_t *(*send_chain)(ngx_connection_t *c, ngx_chain_t *in); + ngx_chain_t *(*send_chain)(ngx_connection_t *c, ngx_chain_t *in, + off_t limit); int flags; } ngx_os_io_t; @@ -36,8 +37,10 @@ int ngx_os_init(ngx_log_t *log); ssize_t ngx_wsarecv(ngx_connection_t *c, u_char *buf, size_t size); ssize_t ngx_overlapped_wsarecv(ngx_connection_t *c, u_char *buf, size_t size); ssize_t ngx_wsarecv_chain(ngx_connection_t *c, ngx_chain_t *chain); -ngx_chain_t *ngx_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in); -ngx_chain_t *ngx_overlapped_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in); +ngx_chain_t *ngx_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); extern ngx_os_io_t ngx_os_io; diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h index cc3a06842..72e5c5e79 100644 --- a/src/os/win32/ngx_win32_config.h +++ b/src/os/win32/ngx_win32_config.h @@ -30,16 +30,28 @@ /* disable some "-W4" level warnings */ -#pragma warning(disable:4054) +/* disable warnings about some 'type cast */ #pragma warning(disable:4054) #pragma warning(disable:4055) + /* unreferenced formal parameter */ #pragma warning(disable:4100) + +/* conditional expression is constant */ #pragma warning(disable:4127) + +/* nonstandard extension used : bit field types other than int */ #pragma warning(disable:4214) + +/* unreachable code */ #pragma warning(disable:4702) + +/* assignment within conditional expression */ #pragma warning(disable:4706) +/* disable "function 'ngx_handle_write_event' not inlined" */ +#pragma warning(disable:4710) + #endif @@ -121,6 +133,9 @@ typedef uint32_t ngx_atomic_t; #endif +#define OFF_T_MAX_VALUE 9223372036854775807 + + /* STUB */ #define HAVE_LITTLE_ENDIAN 1 diff --git a/src/os/win32/ngx_wsasend_chain.c b/src/os/win32/ngx_wsasend_chain.c index 4ada9ea4e..eda422ed2 100644 --- a/src/os/win32/ngx_wsasend_chain.c +++ b/src/os/win32/ngx_wsasend_chain.c @@ -4,7 +4,8 @@ #include <ngx_event.h> -ngx_chain_t *ngx_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in) +ngx_chain_t *ngx_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in, + off_t limit) { int rc; u_char *prev; @@ -99,7 +100,8 @@ ngx_chain_t *ngx_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in) } -ngx_chain_t *ngx_overlapped_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in) +ngx_chain_t *ngx_overlapped_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in, + off_t limit) { int rc; u_char *prev; |