# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1315324342 -14400
# Node ID 69e2e11aa425663063801a333a29b305593a6925
# Parent e165452c1be8865046f3b498c49285e459b8a0c3
Clear old Location header (if any) while adding new one.

This prevents incorrect behaviour when another redirect is issues within
error_page 302 handler.

diff --git a/src/http/modules/ngx_http_static_module.c b/src/http/modules/ngx_http_static_module.c
--- a/src/http/modules/ngx_http_static_module.c
+++ b/src/http/modules/ngx_http_static_module.c
@@ -139,6 +139,10 @@ ngx_http_static_handler(ngx_http_request

ngx_log_debug0(NGX_LOG_DEBUG_HTTP, log, 0, "http dir");

+ if (r->headers_out.location) {
+ r->headers_out.location->hash = 0;
+ }
+
r->headers_out.location = ngx_palloc(r->pool, sizeof(ngx_table_elt_t));
if (r->headers_out.location == NULL) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -983,6 +983,10 @@ ngx_http_core_find_config_phase(ngx_http
}

if (rc == NGX_DONE) {
+ if (r->headers_out.location) {
+ r->headers_out.location->hash = 0;
+ }
+
r->headers_out.location = ngx_list_push(&r->headers_out.headers);
if (r->headers_out.location == NULL) {
ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
@@ -1796,6 +1800,10 @@ ngx_http_send_response(ngx_http_request_

if (status >= NGX_HTTP_MOVED_PERMANENTLY && status <= NGX_HTTP_SEE_OTHER) {

+ if (r->headers_out.location) {
+ r->headers_out.location->hash = 0;
+ }
+
r->headers_out.location = ngx_list_push(&r->headers_out.headers);
if (r->headers_out.location == NULL) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
--- a/src/http/ngx_http_script.c
+++ b/src/http/ngx_http_script.c
@@ -1106,6 +1106,10 @@ ngx_http_script_regex_end_code(ngx_http_
"rewritten redirect: \"%V\"", &e->buf);
}

+ if (r->headers_out.location) {
+ r->headers_out.location->hash = 0;
+ }
+
r->headers_out.location = ngx_list_push(&r->headers_out.headers);
if (r->headers_out.location == NULL) {
e->ip = ngx_http_script_exit;
diff --git a/src/http/ngx_http_special_response.c b/src/http/ngx_http_special_response.c
--- a/src/http/ngx_http_special_response.c
+++ b/src/http/ngx_http_special_response.c
@@ -582,6 +582,10 @@ ngx_http_send_error_page(ngx_http_reques
ngx_str_set(&location->key, "Location");
location->value = uri;

+ if (r->headers_out.location) {
+ r->headers_out.location->hash = 0;
+ }
+
r->headers_out.location = location;

clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel