[nginx] svn commit: r4637 - in trunk/src/http: . modules

[ru at nginx.com]

Author: ru
Date: 2012-05-16 13:22:03 +0000 (Wed, 16 May 2012)
New Revision: 4637
URL: http://trac.nginx.org/nginx/changeset/4637/nginx

Log:
Capped the status code that may be returned with "return" and "try_files".


Modified:
   trunk/src/http/modules/ngx_http_rewrite_module.c
   trunk/src/http/ngx_http_core_module.c

Modified: trunk/src/http/modules/ngx_http_rewrite_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_rewrite_module.c	2012-05-16 13:14:53 UTC (rev 4636)
+++ trunk/src/http/modules/ngx_http_rewrite_module.c	2012-05-16 13:22:03 UTC (rev 4637)
@@ -485,6 +485,12 @@
 
     } 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;
         }

Modified: trunk/src/http/ngx_http_core_module.c
===================================================================
--- trunk/src/http/ngx_http_core_module.c	2012-05-16 13:14:53 UTC (rev 4636)
+++ trunk/src/http/ngx_http_core_module.c	2012-05-16 13:22:03 UTC (rev 4637)
@@ -4662,7 +4662,7 @@
 
         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);