Upstream: multiple WWW-Authenticate headers (ticket #485).
When using proxy_intercept_errors and an error page for error 401
(Unauthorized), multiple WWW-Authenticate headers from the upstream server
response are now properly copied to the response.
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index e68d7aa..80b4a37 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -2647,7 +2647,7 @@
{
ngx_int_t status;
ngx_uint_t i;
- ngx_table_elt_t *h;
+ ngx_table_elt_t *h, *ho, **ph;
ngx_http_err_page_t *err_page;
ngx_http_core_loc_conf_t *clcf;
@@ -2676,18 +2676,26 @@
if (status == NGX_HTTP_UNAUTHORIZED
&& u->headers_in.www_authenticate)
{
- h = ngx_list_push(&r->headers_out.headers);
+ h = u->headers_in.www_authenticate;
+ ph = &r->headers_out.www_authenticate;
- if (h == NULL) {
- ngx_http_upstream_finalize_request(r, u,
+ while (h) {
+ ho = ngx_list_push(&r->headers_out.headers);
+
+ if (ho == NULL) {
+ ngx_http_upstream_finalize_request(r, u,
NGX_HTTP_INTERNAL_SERVER_ERROR);
- return NGX_OK;
+ return NGX_OK;
+ }
+
+ *ho = *h;
+ ho->next = NULL;
+
+ *ph = ho;
+ ph = &ho->next;
+
+ h = h->next;
}
-
- *h = *u->headers_in.www_authenticate;
- h->next = NULL;
-
- r->headers_out.www_authenticate = h;
}
#if (NGX_HTTP_CACHE)
