Mercurial > hg > nginx-vendor-1-0
comparison src/http/ngx_http_core_module.c @ 646:09a689c5e494 NGINX_1_0_13
nginx 1.0.13
*) Feature: the "return" and "error_page" directives can now be used to
return 307 redirections.
*) Bugfix: a segmentation fault might occur in a worker process if the
"resolver" directive was used and there was no "error_log" directive
specified at global level.
Thanks to Roman Arutyunyan.
*) Bugfix: memory leaks.
Thanks to Lanshun Zhou.
*) Bugfix: nginx might log incorrect error "upstream prematurely closed
connection" instead of correct "upstream sent too big header" one.
Thanks to Feibo Li.
*) Bugfix: on ZFS filesystem disk cache size might be calculated
incorrectly; the bug had appeared in 1.0.1.
*) Bugfix: the number of internal redirects to named locations was not
limited.
*) Bugfix: temporary files might be not removed if the "proxy_store"
directive was used with SSI includes.
*) Bugfix: in some cases non-cacheable variables (such as the $args
variable) returned old empty cached value.
*) Bugfix: the "proxy_redirect" directives might be inherited
incorrectly.
*) Bugfix: nginx could not be built with the ngx_http_perl_module if the
--with-openssl option was used.
*) Bugfix: nginx could not be built by the icc 12.1 compiler.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 05 Mar 2012 00:00:00 +0400 |
parents | ad25218fd14b |
children |
comparison
equal
deleted
inserted
replaced
645:60344e6faa47 | 646:09a689c5e494 |
---|---|
1796 | 1796 |
1797 if (ngx_http_complex_value(r, cv, &val) != NGX_OK) { | 1797 if (ngx_http_complex_value(r, cv, &val) != NGX_OK) { |
1798 return NGX_HTTP_INTERNAL_SERVER_ERROR; | 1798 return NGX_HTTP_INTERNAL_SERVER_ERROR; |
1799 } | 1799 } |
1800 | 1800 |
1801 if (status >= NGX_HTTP_MOVED_PERMANENTLY && status <= NGX_HTTP_SEE_OTHER) { | 1801 if (status == NGX_HTTP_MOVED_PERMANENTLY |
1802 | 1802 || status == NGX_HTTP_MOVED_TEMPORARILY |
1803 || status == NGX_HTTP_SEE_OTHER | |
1804 || status == NGX_HTTP_TEMPORARY_REDIRECT) | |
1805 { | |
1803 ngx_http_clear_location(r); | 1806 ngx_http_clear_location(r); |
1804 | 1807 |
1805 r->headers_out.location = ngx_list_push(&r->headers_out.headers); | 1808 r->headers_out.location = ngx_list_push(&r->headers_out.headers); |
1806 if (r->headers_out.location == NULL) { | 1809 if (r->headers_out.location == NULL) { |
1807 return NGX_HTTP_INTERNAL_SERVER_ERROR; | 1810 return NGX_HTTP_INTERNAL_SERVER_ERROR; |
2522 ngx_http_core_srv_conf_t *cscf; | 2525 ngx_http_core_srv_conf_t *cscf; |
2523 ngx_http_core_loc_conf_t **clcfp; | 2526 ngx_http_core_loc_conf_t **clcfp; |
2524 ngx_http_core_main_conf_t *cmcf; | 2527 ngx_http_core_main_conf_t *cmcf; |
2525 | 2528 |
2526 r->main->count++; | 2529 r->main->count++; |
2530 r->uri_changes--; | |
2531 | |
2532 if (r->uri_changes == 0) { | |
2533 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
2534 "rewrite or internal redirection cycle " | |
2535 "while redirect to named location \"%V\"", name); | |
2536 | |
2537 ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); | |
2538 return NGX_DONE; | |
2539 } | |
2527 | 2540 |
2528 cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module); | 2541 cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module); |
2529 | 2542 |
2530 if (cscf->named_locations) { | 2543 if (cscf->named_locations) { |
2531 | 2544 |