Mercurial > hg > nginx
comparison src/http/ngx_http_special_response.c @ 2320:3a00188e49c5 stable-0.6
r2175 merge:
disable error_page loop in 500 error when recursive errors are enabled
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 20 Nov 2008 16:58:41 +0000 |
parents | 9f15e5f8ff9e |
children | d4df1c875351 |
comparison
equal
deleted
inserted
replaced
2319:0c314f62052d | 2320:3a00188e49c5 |
---|---|
368 | 368 |
369 r->headers_out.content_type.len = 0; | 369 r->headers_out.content_type.len = 0; |
370 | 370 |
371 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); | 371 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); |
372 | 372 |
373 if (!r->error_page && clcf->error_pages) { | 373 if (!r->error_page && clcf->error_pages && r->uri_changes != 0) { |
374 | 374 |
375 if (clcf->recursive_error_pages == 0) { | 375 if (clcf->recursive_error_pages == 0) { |
376 r->error_page = 1; | 376 r->error_page = 1; |
377 } | 377 } |
378 | 378 |