Mercurial > hg > nginx

changeset 4660:6c20a377b883 stable-1.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge of r4613: removed surplus condition.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 04 Jun 2012 10:33:38 +0000
parents f12d474f0d5e
children eb565752dd8e
files src/http/ngx_http_request.c
diffstat 1 files changed, 4 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -2001,14 +2001,6 @@ ngx_http_finalize_request(ngx_http_reque
             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_reque
 
         } 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) {