r2141 merge:

if upstream sent a location header without status use 302
This commit is contained in:
Igor Sysoev 2008-11-27 14:31:44 +00:00
parent 5185273c17
commit 5505e205fb
2 changed files with 9 additions and 1 deletions

View File

@ -1189,6 +1189,13 @@ ngx_http_fastcgi_process_header(ngx_http_request_t *r)
u->headers_in.status_n = status;
u->headers_in.status_line = *status_line;
} else if (u->headers_in.location) {
u->headers_in.status_n = 302;
u->headers_in.status_line.len =
sizeof("302 Moved Temporarily") - 1;
u->headers_in.status_line.data =
(u_char *) "302 Moved Temporarily";
} else {
u->headers_in.status_n = 200;
u->headers_in.status_line.len = sizeof("200 OK") - 1;

View File

@ -137,7 +137,8 @@ ngx_http_upstream_header_t ngx_http_upstream_headers_in[] = {
ngx_http_upstream_copy_header_line, 0, 0 },
{ ngx_string("Location"),
ngx_http_upstream_ignore_header_line, 0,
ngx_http_upstream_process_header_line,
offsetof(ngx_http_upstream_headers_in_t, location),
ngx_http_upstream_rewrite_location, 0, 0 },
{ ngx_string("Refresh"),