From: Igor Sysoev <igor@sysoev.ru>
Date: Tue, 23 Dec 2008 17:25:46 +0000 (+0000)
Subject: fix r2378, do not activate subrequest if there are already
X-Git-Tag: release-0.7.29~6
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=8eb5ed2e77c871658e5d204865cc5bfd0f457638;p=nginx.git

fix r2378, do not activate subrequest if there are already
postponed subrequests or data
---

diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 6a72f31d5..458e4565a 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -2094,9 +2094,18 @@ ngx_http_subrequest(ngx_http_request_t *r,
     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;
+            }
+        }
+
         c->data = sr;
     }
 
+no_activate:
+
     sr->in_addr = r->in_addr;
     sr->port = r->port;
     sr->port_text = r->port_text;