Mercurial > hg > nginx
diff 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 |
line wrap: on
line diff
--- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -406,7 +406,7 @@ ngx_http_block(ngx_conf_t *cf, ngx_comma use_rewrite = cmcf->phases[NGX_HTTP_REWRITE_PHASE].handlers.nelts ? 1 : 0; use_access = cmcf->phases[NGX_HTTP_ACCESS_PHASE].handlers.nelts ? 1 : 0; - n = use_rewrite + use_access + 1; /* find config phase */ + n = use_rewrite + use_access + cmcf->try_files + 1 /* find config phase */; for (i = 0; i < NGX_HTTP_LOG_PHASE; i++) { n += cmcf->phases[i].handlers.nelts; @@ -475,6 +475,15 @@ ngx_http_block(ngx_conf_t *cf, ngx_comma continue; + case NGX_HTTP_TRY_FILES_PHASE: + if (cmcf->try_files) { + ph->checker = ngx_http_core_try_files_phase; + n++; + ph++; + } + + continue; + case NGX_HTTP_CONTENT_PHASE: checker = ngx_http_core_content_phase; break;