comparison src/http/ngx_http_core_module.c @ 758:86bb73dc8d40

fix <!--#include virtual=... wait="yes" -->
author Igor Sysoev <igor@sysoev.ru>
date Tue, 10 Oct 2006 14:30:39 +0000
parents d8d7c39e3a76
children 843412b22ba2
comparison
equal deleted inserted replaced
757:a138c4e6031f 758:86bb73dc8d40
1281 } 1281 }
1282 1282
1283 1283
1284 ngx_int_t 1284 ngx_int_t
1285 ngx_http_subrequest(ngx_http_request_t *r, 1285 ngx_http_subrequest(ngx_http_request_t *r,
1286 ngx_str_t *uri, ngx_str_t *args, ngx_chain_t *out, ngx_uint_t flags) 1286 ngx_str_t *uri, ngx_str_t *args, ngx_http_request_t **psr,
1287 ngx_chain_t *out, ngx_uint_t flags)
1287 { 1288 {
1288 ngx_connection_t *c; 1289 ngx_connection_t *c;
1289 ngx_http_request_t *sr; 1290 ngx_http_request_t *sr;
1290 ngx_http_log_ctx_t *ctx; 1291 ngx_http_log_ctx_t *ctx;
1291 ngx_http_core_srv_conf_t *cscf; 1292 ngx_http_core_srv_conf_t *cscf;
1414 ngx_http_handler(sr); 1415 ngx_http_handler(sr);
1415 1416
1416 if (!c->destroyed) { 1417 if (!c->destroyed) {
1417 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, 1418 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
1418 "http subrequest done \"%V?%V\"", uri, &sr->args); 1419 "http subrequest done \"%V?%V\"", uri, &sr->args);
1420
1421 *psr = sr;
1419 1422
1420 if (sr->fast_subrequest) { 1423 if (sr->fast_subrequest) {
1421 sr->fast_subrequest = 0; 1424 sr->fast_subrequest = 0;
1422 1425
1423 if (sr->done) { 1426 if (sr->done) {