backout r1790

diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 016c542983de63ef4fd86f0a6d8d489927f4e0c9..a5ebf1292fb54790224bfd70c58a1362457ba1e3 100644 (file)
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -1641,6 +1641,8 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
         }
     }
 
+    r->done = 1;
+
     if (r != c->data) {
         ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
                        "http finalize non-active request: \"%V?%V\"",
@@ -1648,8 +1650,6 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
         return;
     }
 
-    r->done = 1;
-
     if (r != r->main) {
 
         pr = r->parent;