r2175 merge:

disable error_page loop in 500 error when recursive errors are enabled

diff --git a/src/http/ngx_http_special_response.c b/src/http/ngx_http_special_response.c
index 00b2251d8b6cd7702f1539c077701b39405f2ade..11c41d55b0ec8d11f29b783fb54160fa913043f6 100644 (file)
--- a/src/http/ngx_http_special_response.c
+++ b/src/http/ngx_http_special_response.c
@@ -370,7 +370,7 @@ ngx_http_special_response_handler(ngx_http_request_t *r, ngx_int_t error)
 
     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 
-    if (!r->error_page && clcf->error_pages) {
+    if (!r->error_page && clcf->error_pages && r->uri_changes != 0) {
 
         if (clcf->recursive_error_pages == 0) {
             r->error_page = 1;