Mercurial > hg > nginx
comparison src/http/ngx_http.c @ 4249:e648bb470e12 stable-1.0
Merging r4155, r4219, r4220, r4230:
Windows related fixes:
*) Fixed segmentation fault with empty config on Windows.
See here for report:
http://mailman.nginx.org/pipermail/nginx-ru/2011-September/043288.html
*) Recent SDKs allow to build IPV6 only for Windows XP or above.
*) Fixing conflict with SDK off_t definition.
*) Fix of building by Microsoft Visual C++ 10 compiler.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 01 Nov 2011 13:56:26 +0000 |
parents | d3568507db51 |
children | 4919fb357a5d |
comparison
equal
deleted
inserted
replaced
4248:2fad4d19ea4b | 4249:e648bb470e12 |
---|---|
1745 ls->log.data = &ls->addr_text; | 1745 ls->log.data = &ls->addr_text; |
1746 ls->log.handler = ngx_accept_log_error; | 1746 ls->log.handler = ngx_accept_log_error; |
1747 | 1747 |
1748 #if (NGX_WIN32) | 1748 #if (NGX_WIN32) |
1749 { | 1749 { |
1750 ngx_iocp_conf_t *iocpcf; | 1750 ngx_iocp_conf_t *iocpcf = NULL; |
1751 | 1751 |
1752 iocpcf = ngx_event_get_conf(cf->cycle->conf_ctx, ngx_iocp_module); | 1752 if (ngx_get_conf(cf->cycle->conf_ctx, ngx_events_module)) { |
1753 if (iocpcf->acceptex_read) { | 1753 iocpcf = ngx_event_get_conf(cf->cycle->conf_ctx, ngx_iocp_module); |
1754 } | |
1755 if (iocpcf && iocpcf->acceptex_read) { | |
1754 ls->post_accept_buffer_size = cscf->client_header_buffer_size; | 1756 ls->post_accept_buffer_size = cscf->client_header_buffer_size; |
1755 } | 1757 } |
1756 } | 1758 } |
1757 #endif | 1759 #endif |
1758 | 1760 |