comparison src/http/ngx_http_core_module.c @ 146:36af50a5582d NGINX_0_3_20

nginx 0.3.20 *) Bugfix: in SSI handling. *) Bugfix: the ngx_http_memcached_module did not support the keys in the "/usr?args" form.
author Igor Sysoev <http://sysoev.ru>
date Wed, 11 Jan 2006 00:00:00 +0300
parents e1c6ac408b68
children 396dbbc06dd7
comparison
equal deleted inserted replaced
145:85a84f8da62b 146:36af50a5582d
467 r->valid_unparsed_uri = 1; 467 r->valid_unparsed_uri = 1;
468 r->valid_location = 1; 468 r->valid_location = 1;
469 r->uri_changed = 1; 469 r->uri_changed = 1;
470 r->uri_changes = NGX_HTTP_MAX_REWRITE_CYCLES + 1; 470 r->uri_changes = NGX_HTTP_MAX_REWRITE_CYCLES + 1;
471 471
472 r->phase = (r->main == r) ? NGX_HTTP_POST_READ_PHASE: 472 r->phase = (r == r->main) ? NGX_HTTP_POST_READ_PHASE:
473 NGX_HTTP_SERVER_REWRITE_PHASE; 473 NGX_HTTP_SERVER_REWRITE_PHASE;
474 r->phase_handler = 0; 474 r->phase_handler = 0;
475 475
476 ngx_http_core_run_phases(r); 476 ngx_http_core_run_phases(r);
477 } 477 }
514 } 514 }
515 515
516 r->phase = NGX_HTTP_FIND_CONFIG_PHASE; 516 r->phase = NGX_HTTP_FIND_CONFIG_PHASE;
517 } 517 }
518 518
519 if (r->phase == NGX_HTTP_ACCESS_PHASE && r->main != r) { 519 if (r->phase == NGX_HTTP_ACCESS_PHASE && r != r->main) {
520 continue; 520 continue;
521 } 521 }
522 522
523 if (r->phase == NGX_HTTP_CONTENT_PHASE && r->content_handler) { 523 if (r->phase == NGX_HTTP_CONTENT_PHASE && r->content_handler) {
524 r->write_event_handler = ngx_http_request_empty_handler; 524 r->write_event_handler = ngx_http_request_empty_handler;
1227 } else { 1227 } else {
1228 r->postponed = pr; 1228 r->postponed = pr;
1229 } 1229 }
1230 1230
1231 sr->internal = 1; 1231 sr->internal = 1;
1232 sr->fast_subrequest = 1;
1232 1233
1233 sr->discard_body = r->discard_body; 1234 sr->discard_body = r->discard_body;
1234 sr->main_filter_need_in_memory = r->main_filter_need_in_memory; 1235 sr->main_filter_need_in_memory = r->main_filter_need_in_memory;
1235 1236
1236 ngx_http_handler(sr); 1237 ngx_http_handler(sr);
1237 1238
1238 #if (NGX_LOG_DEBUG)
1239 if (!c->destroyed) { 1239 if (!c->destroyed) {
1240 sr->fast_subrequest = 0;
1241
1240 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0, 1242 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
1241 "http subrequest done \"%V?%V\"", uri, &sr->args); 1243 "http subrequest done \"%V?%V\"", uri, &sr->args);
1242 } 1244 }
1243 #endif
1244 1245
1245 return NGX_OK; 1246 return NGX_OK;
1246 } 1247 }
1247 1248
1248 1249