comparison src/http/ngx_http.c @ 642:d3cf6c6b0043 NGINX_1_1_5

nginx 1.1.5 *) Feature: the "uwsgi_buffering" and "scgi_buffering" directives. Thanks to Peter Smit. *) Bugfix: non-cacheable responses might be cached if "proxy_cache_bypass" directive was used. Thanks to John Ferlito. *) Bugfix: in HTTP/1.1 support in the ngx_http_proxy_module. *) Bugfix: cached responses with an empty body were returned incorrectly; the bug had appeared in 0.8.31. *) Bugfix: 201 responses of the ngx_http_dav_module were incorrect; the bug had appeared in 0.8.32. *) Bugfix: in the "return" directive. *) Bugfix: the "ssl_session_cache builtin" directive caused segmentation fault; the bug had appeared in 1.1.1.
author Igor Sysoev <http://sysoev.ru>
date Wed, 05 Oct 2011 00:00:00 +0400
parents eb208e0cf44d
children 753f505670e0
comparison
equal deleted inserted replaced
641:6c19b251b926 642:d3cf6c6b0043
1279 1279
1280 if (lsopt->set) { 1280 if (lsopt->set) {
1281 1281
1282 if (addr[i].opt.set) { 1282 if (addr[i].opt.set) {
1283 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 1283 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
1284 "a duplicate listen options for %s", addr[i].opt.addr); 1284 "duplicate listen options for %s", addr[i].opt.addr);
1285 return NGX_ERROR; 1285 return NGX_ERROR;
1286 } 1286 }
1287 1287
1288 addr[i].opt = *lsopt; 1288 addr[i].opt = *lsopt;
1289 } 1289 }
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