Mercurial > hg > nginx-vendor-current

comparison src/http/ngx_http_core_module.c @ 102:f63280c59dd5 NGINX_0_2_5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
101:5bb09dde34e7 102:f63280c59dd5
496 } 496 }
497 497
498 r->phase = NGX_HTTP_FIND_CONFIG_PHASE; 498 r->phase = NGX_HTTP_FIND_CONFIG_PHASE;
499 } 499 }
500 500
501 if (r->phase == NGX_HTTP_ACCESS_PHASE && r->main) { 501 if (r->phase == NGX_HTTP_ACCESS_PHASE && r->main != r) {
502 continue; 502 continue;
503 } 503 }
504 504
505 if (r->phase == NGX_HTTP_CONTENT_PHASE && r->content_handler) { 505 if (r->phase == NGX_HTTP_CONTENT_PHASE && r->content_handler) {
506 r->write_event_handler = ngx_http_request_empty_handler; 506 r->write_event_handler = ngx_http_request_empty_handler;
1097 1097
1098 if (ngx_http_set_exten(sr) != NGX_OK) { 1098 if (ngx_http_set_exten(sr) != NGX_OK) {
1099 return NGX_HTTP_INTERNAL_SERVER_ERROR; 1099 return NGX_HTTP_INTERNAL_SERVER_ERROR;
1100 } 1100 }
1101 1101
1102 sr->main = r->main ? r->main : r; 1102 sr->main = r->main;
1103 sr->parent = r; 1103 sr->parent = r;
1104 sr->read_event_handler = ngx_http_request_empty_handler; 1104 sr->read_event_handler = ngx_http_request_empty_handler;
1105 sr->write_event_handler = ngx_http_request_empty_handler; 1105 sr->write_event_handler = ngx_http_request_empty_handler;
1106 1106
1107 if (r->connection->data == r) { 1107 if (r->connection->data == r) {