comparison src/http/ngx_http_request.c @ 644:6f21ae02fb01 NGINX_1_1_6

nginx 1.1.6 *) Change in internal API: now module context data are cleared while internal redirect to named location. Requested by Yichun Zhang. *) Change: if a server in an upstream failed, only one request will be sent to it after fail_timeout; the server will be considered alive if it will successfully respond to the request. *) Change: now the 0x7F-0x1F characters are escaped as \xXX in an access_log. *) 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. *) 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.
author Igor Sysoev <http://sysoev.ru>
date Mon, 17 Oct 2011 00:00:00 +0400
parents 943566b4d82e
children 4d05413aebad
comparison
equal deleted inserted replaced
643:a4bb0b481f6c 644:6f21ae02fb01
2246 } 2246 }
2247 2247
2248 return; 2248 return;
2249 } 2249 }
2250 2250
2251 } else { 2251 }
2252 if (wev->delayed || r->aio) { 2252
2253 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, wev->log, 0, 2253 if (wev->delayed || r->aio) {
2254 "http writer delayed"); 2254 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, wev->log, 0,
2255 2255 "http writer delayed");
2256 if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) { 2256
2257 ngx_http_close_request(r, 0); 2257 if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) {
2258 } 2258 ngx_http_close_request(r, 0);
2259 2259 }
2260 return; 2260
2261 } 2261 return;
2262 } 2262 }
2263 2263
2264 rc = ngx_http_output_filter(r, NULL); 2264 rc = ngx_http_output_filter(r, NULL);
2265 2265
2266 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0, 2266 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, c->log, 0,
2272 return; 2272 return;
2273 } 2273 }
2274 2274
2275 if (r->buffered || r->postponed || (r == r->main && c->buffered)) { 2275 if (r->buffered || r->postponed || (r == r->main && c->buffered)) {
2276 2276
2277 if (!wev->ready && !wev->delayed) { 2277 if (!wev->delayed) {
2278 ngx_add_timer(wev, clcf->send_timeout); 2278 ngx_add_timer(wev, clcf->send_timeout);
2279 } 2279 }
2280 2280
2281 if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) { 2281 if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) {
2282 ngx_http_close_request(r, 0); 2282 ngx_http_close_request(r, 0);