Mercurial > hg > nginx-vendor-current
diff src/http/ngx_http_core_module.c @ 478:f2c6a7373274 NGINX_0_7_51
nginx 0.7.51
*) Feature: the "try_files" directive supports a response code in the
fallback parameter.
*) Feature: now any response code can be used in the "return" directive.
*) Bugfix: the "error_page" directive made an external redirect without
query string; the bug had appeared in 0.7.44.
*) Bugfix: if servers listened on several defined explicitly addresses,
then virtual servers might not work; the bug had appeared in 0.7.39.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Sun, 12 Apr 2009 00:00:00 +0400 |
parents | 56baf312c1b5 |
children | 549994537f15 |
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -1144,6 +1144,11 @@ ngx_http_core_try_files_phase(ngx_http_r if (tf->lengths == NULL && tf->name.len == 0) { + if (tf->code) { + ngx_http_finalize_request(r, tf->code); + return NGX_OK; + } + path.len -= root; path.data += root; @@ -3875,7 +3880,7 @@ ngx_http_core_error_page(ngx_conf_t *cf, args.len = 0; args.data = NULL; - if (cv.lengths == NULL) { + if (cv.lengths == NULL && uri.data[0] == '/') { p = (u_char *) ngx_strchr(uri.data, '?'); if (p) { @@ -3939,6 +3944,7 @@ ngx_http_core_try_files(ngx_conf_t *cf, ngx_http_core_loc_conf_t *clcf = conf; ngx_str_t *value; + ngx_int_t code; ngx_uint_t i, n; ngx_http_try_file_t *tf; ngx_http_script_compile_t sc; @@ -3994,6 +4000,20 @@ ngx_http_core_try_files(ngx_conf_t *cf, } } + if (tf[i - 1].name.data[0] == '=') { + + code = ngx_atoi(tf[i - 1].name.data + 1, tf[i - 1].name.len - 2); + + if (code == NGX_ERROR) { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, + "invalid code \"%*s\"", + tf[i - 1].name.len - 1, tf[i - 1].name.data); + return NGX_CONF_ERROR; + } + + tf[i].code = code; + } + return NGX_CONF_OK; }