[nginx] svn commit: r4661 - in branches/stable-1.2: . src/http

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-06-04 10:33:38 +0000 (Mon, 04 Jun 2012)
New Revision: 4661
URL: http://trac.nginx.org/nginx/changeset/4661/nginx

Log:
Merge of r4613: removed surplus condition.


Modified:
   branches/stable-1.2/
   branches/stable-1.2/src/http/ngx_http_request.c

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2	2012-06-04 10:27:00 UTC (rev 4660)
+++ branches/stable-1.2	2012-06-04 10:33:38 UTC (rev 4661)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4612,4620
+/trunk:4611-4613,4620
\ No newline at end of property
Modified: branches/stable-1.2/src/http/ngx_http_request.c
===================================================================
--- branches/stable-1.2/src/http/ngx_http_request.c	2012-06-04 10:27:00 UTC (rev 4660)
+++ branches/stable-1.2/src/http/ngx_http_request.c	2012-06-04 10:33:38 UTC (rev 4661)
@@ -2001,14 +2001,6 @@
             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 @@
 
         } 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) {