Merge of r4613: removed surplus condition.

This commit is contained in:
Maxim Dounin 2012-06-04 10:33:38 +00:00
parent 65107cfd1c
commit 75dbcedba1
1 changed files with 4 additions and 8 deletions

View File

@ -2001,14 +2001,6 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
return;
}
#if (NGX_DEBUG)
if (r != c->data) {
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
"http finalize non-active request: \"%V?%V\"",
&r->uri, &r->args);
}
#endif
pr = r->parent;
if (r == c->data) {
@ -2042,6 +2034,10 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
} else {
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
"http finalize non-active request: \"%V?%V\"",
&r->uri, &r->args);
r->write_event_handler = ngx_http_request_finalizer;
if (r->waited) {