Mercurial > hg > nginx-vendor-current
diff src/http/ngx_http_core_module.c @ 102:f63280c59dd5 NGINX_0_2_5
nginx 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.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Tue, 04 Oct 2005 00:00:00 +0400 |
parents | 45945fa8b8ba |
children | 146eff53ab60 |
line wrap: on
line diff
--- 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_reques 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 * 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;