comparison src/http/ngx_http.c @ 2655:87e1fcd9b604 stable-0.6

r2202, r2408, r2425, r2454, r2459, r2482, r2504, r2542, r2565, r2579, r2580, r2585, r2586, r2587, r2591, r2626 merge: try_files
author Igor Sysoev <igor@sysoev.ru>
date Thu, 02 Apr 2009 06:44:45 +0000
parents e3baaf7a9bde
children
comparison
equal deleted inserted replaced
2654:96b878c984f4 2655:87e1fcd9b604
404 cmcf->phase_engine.location_rewrite_index = (ngx_uint_t) -1; 404 cmcf->phase_engine.location_rewrite_index = (ngx_uint_t) -1;
405 find_config_index = 0; 405 find_config_index = 0;
406 use_rewrite = cmcf->phases[NGX_HTTP_REWRITE_PHASE].handlers.nelts ? 1 : 0; 406 use_rewrite = cmcf->phases[NGX_HTTP_REWRITE_PHASE].handlers.nelts ? 1 : 0;
407 use_access = cmcf->phases[NGX_HTTP_ACCESS_PHASE].handlers.nelts ? 1 : 0; 407 use_access = cmcf->phases[NGX_HTTP_ACCESS_PHASE].handlers.nelts ? 1 : 0;
408 408
409 n = use_rewrite + use_access + 1; /* find config phase */ 409 n = use_rewrite + use_access + cmcf->try_files + 1 /* find config phase */;
410 410
411 for (i = 0; i < NGX_HTTP_LOG_PHASE; i++) { 411 for (i = 0; i < NGX_HTTP_LOG_PHASE; i++) {
412 n += cmcf->phases[i].handlers.nelts; 412 n += cmcf->phases[i].handlers.nelts;
413 } 413 }
414 414
468 468
469 case NGX_HTTP_POST_ACCESS_PHASE: 469 case NGX_HTTP_POST_ACCESS_PHASE:
470 if (use_access) { 470 if (use_access) {
471 ph->checker = ngx_http_core_post_access_phase; 471 ph->checker = ngx_http_core_post_access_phase;
472 ph->next = n; 472 ph->next = n;
473 ph++;
474 }
475
476 continue;
477
478 case NGX_HTTP_TRY_FILES_PHASE:
479 if (cmcf->try_files) {
480 ph->checker = ngx_http_core_try_files_phase;
481 n++;
473 ph++; 482 ph++;
474 } 483 }
475 484
476 continue; 485 continue;
477 486