comparison src/http/ngx_http_core_module.c @ 2421:8f0f1d151f14

fix r2378, do not activate subrequest if there are already postponed subrequests or data
author Igor Sysoev <igor@sysoev.ru>
date Tue, 23 Dec 2008 17:25:46 +0000
parents 2820d548417d
children 5bdb1591d37f
comparison
equal deleted inserted replaced
2420:2820d548417d 2421:8f0f1d151f14
2092 sr->post_subrequest = ps; 2092 sr->post_subrequest = ps;
2093 sr->read_event_handler = ngx_http_request_empty_handler; 2093 sr->read_event_handler = ngx_http_request_empty_handler;
2094 sr->write_event_handler = ngx_http_handler; 2094 sr->write_event_handler = ngx_http_handler;
2095 2095
2096 if (c->data == r) { 2096 if (c->data == r) {
2097
2098 for (pr = r->postponed; pr; pr = pr->next) {
2099 if (pr->request) {
2100 goto no_activate;
2101 }
2102 }
2103
2097 c->data = sr; 2104 c->data = sr;
2098 } 2105 }
2106
2107 no_activate:
2099 2108
2100 sr->in_addr = r->in_addr; 2109 sr->in_addr = r->in_addr;
2101 sr->port = r->port; 2110 sr->port = r->port;
2102 sr->port_text = r->port_text; 2111 sr->port_text = r->port_text;
2103 2112