Mercurial > hg > nginx
comparison src/http/ngx_http_request.c @ 3216:79ae445ec57b
fix two previous commits: an early parallel body discarding completion
disables incomplete ngx_http_writer()
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 20 Oct 2009 11:48:28 +0000 |
parents | 4edf28522d24 |
children | 81b8416054b0 |
comparison
equal
deleted
inserted
replaced
3215:4edf28522d24 | 3216:79ae445ec57b |
---|---|
2105 | 2105 |
2106 if (r->main->count != 1) { | 2106 if (r->main->count != 1) { |
2107 | 2107 |
2108 if (r->discard_body) { | 2108 if (r->discard_body) { |
2109 r->read_event_handler = ngx_http_discarded_request_body_handler; | 2109 r->read_event_handler = ngx_http_discarded_request_body_handler; |
2110 r->write_event_handler = ngx_http_request_empty_handler; | |
2111 | 2110 |
2112 if (r->lingering_time == 0) { | 2111 if (r->lingering_time == 0) { |
2113 r->lingering_time = ngx_time() | 2112 r->lingering_time = ngx_time() |
2114 + (time_t) (clcf->lingering_time / 1000); | 2113 + (time_t) (clcf->lingering_time / 1000); |
2115 ngx_add_timer(r->connection->read, clcf->lingering_timeout); | 2114 ngx_add_timer(r->connection->read, clcf->lingering_timeout); |
2246 return; | 2245 return; |
2247 } | 2246 } |
2248 | 2247 |
2249 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, wev->log, 0, | 2248 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, wev->log, 0, |
2250 "http writer done: \"%V?%V\"", &r->uri, &r->args); | 2249 "http writer done: \"%V?%V\"", &r->uri, &r->args); |
2250 | |
2251 r->write_event_handler = ngx_http_request_empty_handler; | |
2251 | 2252 |
2252 ngx_http_finalize_request(r, rc); | 2253 ngx_http_finalize_request(r, rc); |
2253 } | 2254 } |
2254 | 2255 |
2255 | 2256 |