diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-10-04 10:38:53 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-10-04 10:38:53 +0000 |
| commit | f6e1fe3f28ee43792a4543e8b9e8702713c5b74a (patch) | |
| tree | 67cd150690123c53effef3aac42cca767ceafbbf /src/http/ngx_http_core_module.c | |
| parent | 4dabff2624d4bae5e9cae37fb80d864501481432 (diff) | |
| download | nginx-f6e1fe3f28ee43792a4543e8b9e8702713c5b74a.tar.gz nginx-f6e1fe3f28ee43792a4543e8b9e8702713c5b74a.zip | |
nginx-0.2.5-RELEASE importrelease-0.2.5
*) Change: the duplicate value of the ngx_http_geo_module variable now
causes the warning and changes old value.
*) Feature: the ngx_http_ssi_module supports the "set" command.
*) Feature: the ngx_http_ssi_module supports the "file" parameter in
the "include" command.
*) Feature: the ngx_http_ssi_module supports the variable value
substitutions in expressions of the "if" command.
Diffstat (limited to 'src/http/ngx_http_core_module.c')
| -rw-r--r-- | src/http/ngx_http_core_module.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index e9f594217..c07e367a0 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -498,7 +498,7 @@ ngx_http_core_run_phases(ngx_http_request_t *r) r->phase = NGX_HTTP_FIND_CONFIG_PHASE; } - if (r->phase == NGX_HTTP_ACCESS_PHASE && r->main) { + if (r->phase == NGX_HTTP_ACCESS_PHASE && r->main != r) { continue; } @@ -1099,7 +1099,7 @@ ngx_http_subrequest(ngx_http_request_t *r, return NGX_HTTP_INTERNAL_SERVER_ERROR; } - sr->main = r->main ? r->main : r; + sr->main = r->main; sr->parent = r; sr->read_event_handler = ngx_http_request_empty_handler; sr->write_event_handler = ngx_http_request_empty_handler; |