comparison src/http/ngx_http_request.c @ 638:692f4d4d7f10 NGINX_1_0_9

nginx 1.0.9 *) Change: now the 0x7F-0x1F characters are escaped as \xXX in an access_log. *) Change: now SIGWINCH signal works only in daemon mode. *) Feature: "proxy/fastcgi/scgi/uwsgi_ignore_headers" directives support the following additional values: X-Accel-Limit-Rate, X-Accel-Buffering, X-Accel-Charset. *) Feature: decrease of memory consumption if SSL is used. *) Feature: accept filters are now supported on NetBSD. *) Feature: the "uwsgi_buffering" and "scgi_buffering" directives. Thanks to Peter Smit. *) Bugfix: a segmentation fault occurred on start or while reconfiguration if the "ssl" directive was used at http level and there was no "ssl_certificate" defined. *) Bugfix: some UTF-8 characters were processed incorrectly. Thanks to Alexey Kuts. *) Bugfix: the ngx_http_rewrite_module directives specified at "server" level were executed twice if no matching locations were defined. *) Bugfix: a socket leak might occurred if "aio sendfile" was used. *) Bugfix: connections with fast clients might be closed after send_timeout if file AIO was used. *) Bugfix: in the ngx_http_autoindex_module. *) Bugfix: the module ngx_http_mp4_module did not support seeking on 32-bit platforms. *) Bugfix: non-cacheable responses might be cached if "proxy_cache_bypass" directive was used. Thanks to John Ferlito. *) 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_verify_client", "ssl_verify_depth", and "ssl_prefer_server_ciphers" directives might work incorrectly if SNI was used.
author Igor Sysoev <http://sysoev.ru>
date Tue, 01 Nov 2011 00:00:00 +0400
parents 0d6525917227
children 1b80544421e8
comparison
equal deleted inserted replaced
637:ea7441793bba 638:692f4d4d7f10
671 671
672 sscf = ngx_http_get_module_srv_conf(r, ngx_http_ssl_module); 672 sscf = ngx_http_get_module_srv_conf(r, ngx_http_ssl_module);
673 673
674 SSL_set_SSL_CTX(ssl_conn, sscf->ssl.ctx); 674 SSL_set_SSL_CTX(ssl_conn, sscf->ssl.ctx);
675 675
676 /*
677 * SSL_set_SSL_CTX() only changes certs as of 1.0.0d
678 * adjust other things we care about
679 */
680
681 SSL_set_verify(ssl_conn, SSL_CTX_get_verify_mode(sscf->ssl.ctx),
682 SSL_CTX_get_verify_callback(sscf->ssl.ctx));
683
684 SSL_set_verify_depth(ssl_conn, SSL_CTX_get_verify_depth(sscf->ssl.ctx));
685
686 #ifdef SSL_CTRL_CLEAR_OPTIONS
687 /* only in 0.9.8m+ */
688 SSL_clear_options(ssl_conn, SSL_get_options(ssl_conn) &
689 ~SSL_CTX_get_options(sscf->ssl.ctx));
690 #endif
691
692 SSL_set_options(ssl_conn, SSL_CTX_get_options(sscf->ssl.ctx));
693
676 return SSL_TLSEXT_ERR_OK; 694 return SSL_TLSEXT_ERR_OK;
677 } 695 }
678 696
679 #endif 697 #endif
680 698
2228 } 2246 }
2229 2247
2230 return; 2248 return;
2231 } 2249 }
2232 2250
2233 } else { 2251 }
2234 if (wev->delayed || r->aio) { 2252
2235 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, wev->log, 0, 2253 if (wev->delayed || r->aio) {
2236 "http writer delayed"); 2254 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, wev->log, 0,
2237 2255 "http writer delayed");
2238 if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) { 2256
2239 ngx_http_close_request(r, 0); 2257 if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) {
2240 } 2258 ngx_http_close_request(r, 0);
2241 2259 }
2242 return; 2260
2243 } 2261 return;
2244 } 2262 }
2245 2263
2246 rc = ngx_http_output_filter(r, NULL); 2264 rc = ngx_http_output_filter(r, NULL);
2247 2265
2248 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0, 2266 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0,
2254 return; 2272 return;
2255 } 2273 }
2256 2274
2257 if (r->buffered || r->postponed || (r == r->main && c->buffered)) { 2275 if (r->buffered || r->postponed || (r == r->main && c->buffered)) {
2258 2276
2259 if (!wev->ready && !wev->delayed) { 2277 if (!wev->delayed) {
2260 ngx_add_timer(wev, clcf->send_timeout); 2278 ngx_add_timer(wev, clcf->send_timeout);
2261 } 2279 }
2262 2280
2263 if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) { 2281 if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) {
2264 ngx_http_close_request(r, 0); 2282 ngx_http_close_request(r, 0);