diff options
Diffstat (limited to 'src/os/win32')
| -rw-r--r-- | src/os/win32/ngx_sendfile.c | 7 | ||||
| -rw-r--r-- | src/os/win32/ngx_socket.c | 12 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/os/win32/ngx_sendfile.c b/src/os/win32/ngx_sendfile.c index ce43b37b3..c2bdf6c62 100644 --- a/src/os/win32/ngx_sendfile.c +++ b/src/os/win32/ngx_sendfile.c @@ -83,11 +83,12 @@ int ngx_sendfile(ngx_connection_t *c, ptfb = NULL; } -#if 0 +#if 1 flags = TF_DISCONNECT|TF_REUSE_SOCKET; -#endif - + tfrc = transmitfile(c->fd, NULL, 0, 0, &olp, NULL, flags); +#else tfrc = TransmitFile(c->fd, fd, nbytes, 0, &olp, ptfb, flags); +#endif #if 0 #if 1 diff --git a/src/os/win32/ngx_socket.c b/src/os/win32/ngx_socket.c index 09cbddf6b..f289a33e7 100644 --- a/src/os/win32/ngx_socket.c +++ b/src/os/win32/ngx_socket.c @@ -8,9 +8,9 @@ /* These pointers should be per protocol ? */ -LPFN_ACCEPTEX AcceptEx; -LPFN_GETACCEPTEXSOCKADDRS GetAcceptExSockaddrs; -LPFN_TRANSMITFILE TransmitFile; +LPFN_ACCEPTEX acceptex; +LPFN_GETACCEPTEXSOCKADDRS getacceptexsockaddrs; +LPFN_TRANSMITFILE transmitfile; static GUID ae_guid = WSAID_ACCEPTEX; static GUID as_guid = WSAID_GETACCEPTEXSOCKADDRS; @@ -37,7 +37,7 @@ int ngx_init_sockets(ngx_log_t *log) } if (WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, &ae_guid, sizeof(GUID), - &AcceptEx, sizeof(LPFN_ACCEPTEX), &bytes, NULL, NULL) == -1) { + &acceptex, sizeof(LPFN_ACCEPTEX), &bytes, NULL, NULL) == -1) { ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno, "WSAIoctl(SIO_GET_EXTENSION_FUNCTION_POINTER, " @@ -46,7 +46,7 @@ int ngx_init_sockets(ngx_log_t *log) } if (WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, &as_guid, sizeof(GUID), - &GetAcceptExSockaddrs, sizeof(LPFN_GETACCEPTEXSOCKADDRS), + &getacceptexsockaddrs, sizeof(LPFN_GETACCEPTEXSOCKADDRS), &bytes, NULL, NULL) == -1) { ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno, @@ -56,7 +56,7 @@ int ngx_init_sockets(ngx_log_t *log) } if (WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, &tf_guid, sizeof(GUID), - &TransmitFile, sizeof(LPFN_TRANSMITFILE), &bytes, + &transmitfile, sizeof(LPFN_TRANSMITFILE), &bytes, NULL, NULL) == -1) { ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno, "WSAIoctl(SIO_GET_EXTENSION_FUNCTION_POINTER, " |