diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2012-05-16 13:22:03 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2012-05-16 13:22:03 +0000 |
| commit | befc111d4f1b0986998e7fa0451f52e874afcb19 (patch) | |
| tree | 7bbb641fba71f4d14d148ce5ad2feb94a10400ce /src | |
| parent | 10c205a1b3641fe5cc68051467c82becb3af11de (diff) | |
| download | nginx-befc111d4f1b0986998e7fa0451f52e874afcb19.tar.gz nginx-befc111d4f1b0986998e7fa0451f52e874afcb19.tar.bz2 | |
Capped the status code that may be returned with "return" and "try_files".
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/modules/ngx_http_rewrite_module.c | 6 | ||||
| -rw-r--r-- | src/http/ngx_http_core_module.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/http/modules/ngx_http_rewrite_module.c b/src/http/modules/ngx_http_rewrite_module.c index 74d26e524..4081f8774 100644 --- a/src/http/modules/ngx_http_rewrite_module.c +++ b/src/http/modules/ngx_http_rewrite_module.c @@ -485,6 +485,12 @@ ngx_http_rewrite_return(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) } else { + if (ret->status > 999) { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, + "invalid return code \"%V\"", &value[1]); + return NGX_CONF_ERROR; + } + if (cf->args->nelts == 2) { return NGX_CONF_OK; } diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index 31832ceb8..5bb01d9ea 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -4662,7 +4662,7 @@ ngx_http_core_try_files(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) code = ngx_atoi(tf[i - 1].name.data + 1, tf[i - 1].name.len - 2); - if (code == NGX_ERROR) { + if (code == NGX_ERROR || code > 999) { ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid code \"%*s\"", tf[i - 1].name.len - 1, tf[i - 1].name.data); |