# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1230053146 0
# Node ID 8f0f1d151f141614a7f8c349c5ffae018945a01d
# Parent  2820d548417d227f7cd745764d9e7b95f37d2275
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
--- 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 *
     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;