Mercurial > hg > nginx

changeset 1923:c72fe0a8d9b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix large memory allocation in "error_page 495-497 /uri"
author Igor Sysoev <igor@sysoev.ru>
date Mon, 10 Mar 2008 14:45:41 +0000
parents d23396f2a902
children 291689a7e5dc
files src/http/ngx_http_core_module.c
diffstat 1 files changed, 16 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -3559,7 +3559,22 @@ ngx_http_core_error_page(ngx_conf_t *cf,
             return NGX_CONF_ERROR;
         }
 
-        err->overwrite = (overwrite >= 0) ? overwrite : err->status;
+        if (overwrite >= 0) {
+            err->overwrite = overwrite;
+
+        } else {
+            switch (err->status) {
+                case NGX_HTTP_TO_HTTPS:
+                case NGX_HTTPS_CERT_ERROR:
+                case NGX_HTTPS_NO_CERT:
+                    err->overwrite = NGX_HTTP_BAD_REQUEST;
+                    break;
+
+                default:
+                    err->overwrite = err->status;
+                    break;
+            }
+        }
 
         err->uri = uri;
         err->uri_lengths = uri_lengths;