From: Igor Sysoev <igor@sysoev.ru>
Date: Wed, 24 Dec 2008 06:11:04 +0000 (+0000)
Subject: update r2422
X-Git-Tag: release-0.7.29~4
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=d8e54adb6d6b6ee253de5f16006f94e2f88264e5;p=nginx.git

update r2422
---

diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 458e4565a..e28197356 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -2093,19 +2093,10 @@ ngx_http_subrequest(ngx_http_request_t *r,
     sr->read_event_handler = ngx_http_request_empty_handler;
     sr->write_event_handler = ngx_http_handler;
 
-    if (c->data == r) {
-
-        for (pr = r->postponed; pr; pr = pr->next) {
-            if (pr->request) {
-                goto no_activate;
-            }
-        }
-
+    if (c->data == r && r->postponed == NULL) {
         c->data = sr;
     }
 
-no_activate:
-
     sr->in_addr = r->in_addr;
     sr->port = r->port;
     sr->port_text = r->port_text;