diff options
author | Maxim Dounin <mdounin@mdounin.ru> | 2012-06-04 10:33:38 +0000 |
---|---|---|
committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-06-04 10:33:38 +0000 |
commit | f87ed889a0b7e54da973102bf9424c1a672ff6f3 (patch) | |
tree | 3d38f07ee9acb738c29687a64221e1fdd445b633 /src/http/ngx_http_request.c | |
parent | 1ba48195d7aa84ff6f130720cf2314b74cc75823 (diff) | |
download | nginx-f87ed889a0b7e54da973102bf9424c1a672ff6f3.tar.gz nginx-f87ed889a0b7e54da973102bf9424c1a672ff6f3.zip |
Merge of r4613: removed surplus condition.
Diffstat (limited to 'src/http/ngx_http_request.c')
-rw-r--r-- | src/http/ngx_http_request.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c index 052f379ac..59d4d4ae6 100644 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -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) { |