fix r2378, do not activate subrequest if there are already

postponed subrequests or data
This commit is contained in:
Igor Sysoev 2008-12-23 17:25:46 +00:00
parent ce55952790
commit 8eb5ed2e77

View File

@ -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;