Ticket #485: patch.485.diff

src/http/modules/ngx_http_auth_basic_module.c

@@ -351 +351 @@
 {
     size_t   len;
     u_char  *basic, *p;
+    ngx_table_elt_t **wwauth;
 
-    r->headers_out.www_authenticate = ngx_list_push(&r->headers_out.headers);
-    if (r->headers_out.www_authenticate == NULL) {
+    wwauth = r->headers_out.www_authenticate.elts;
+    if (wwauth == NULL) {
+        if (ngx_array_init(&r->headers_out.www_authenticate, r->pool,
+                           1, sizeof(ngx_table_elt_t *)) != NGX_OK) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+    
+        wwauth = ngx_array_push(&r->headers_out.www_authenticate);
+        
+        if (wwauth == NULL) {
+            return NGX_HTTP_INTERNAL_SERVER_ERROR;
+        }
+    }
+
+    *wwauth = ngx_list_push(&r->headers_out.headers);
+    if (*wwauth == NULL) {
         return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
@@ -368 +383 @@
     p = ngx_cpymem(p, realm->data, realm->len);
     *p = '"';
 
-    r->headers_out.www_authenticate->hash = 1;
-    ngx_str_set(&r->headers_out.www_authenticate->key, "WWW-Authenticate");
-    r->headers_out.www_authenticate->value.data = basic;
-    r->headers_out.www_authenticate->value.len = len;
+    (*wwauth)->hash = 1;
+    ngx_str_set(&(*wwauth)->key, "WWW-Authenticate");
+    (*wwauth)->value.data = basic;
+    (*wwauth)->value.len = len;
 
     return NGX_HTTP_UNAUTHORIZED;
 }

src/http/modules/ngx_http_auth_request_module.c

@@ -101 +101 @@
 static ngx_int_t
 ngx_http_auth_request_handler(ngx_http_request_t *r)
 {
-    ngx_table_elt_t               *h, *ho;
+    ngx_table_elt_t               *h, *ho, **hh;
     ngx_http_request_t            *sr;
     ngx_http_post_subrequest_t    *ps;
     ngx_http_auth_request_ctx_t   *ctx;
@@ -140 +140 @@
 
         if (ctx->status == NGX_HTTP_UNAUTHORIZED) {
             sr = ctx->subrequest;
-
-            h = sr->headers_out.www_authenticate;
+            h = NULL;
+            if (sr->headers_out.www_authenticate.elts != NULL) {
+                hh = sr->headers_out.www_authenticate.elts;
+                h = *hh;
+            }
 
             if (!h && sr->upstream) {
                 h = sr->upstream->headers_in.www_authenticate;
@@ -153 +156 @@
                     return NGX_ERROR;
                 }
 
+                hh = r->headers_out.www_authenticate.elts;
+                if (hh == NULL) {
+                    if (ngx_array_init(&r->headers_out.www_authenticate, r->pool,
+                                       1, sizeof(ngx_table_elt_t *)) != NGX_OK) {
+                        return NGX_ERROR;
+                    }
+
+                    hh = ngx_array_push(&r->headers_out.www_authenticate);
+                    if (hh == NULL) {
+                        return NGX_ERROR;
+                    }
+                }             
+
                 *ho = *h;
-
-                r->headers_out.www_authenticate = ho;
+                *hh = ho;
             }
 
             return ctx->status;

src/http/ngx_http_core_module.c

@@ -1101 +1101 @@
 ngx_http_core_access_phase(ngx_http_request_t *r, ngx_http_phase_handler_t *ph)
 {
     ngx_int_t                  rc;
+    ngx_uint_t                 i;
     ngx_http_core_loc_conf_t  *clcf;
+    ngx_table_elt_t           **wwauth;
 
     if (r != r->main) {
         r->phase_handler = ph->next;
@@ -1135 +1137 @@
         if (rc == NGX_OK) {
             r->access_code = 0;
 
-            if (r->headers_out.www_authenticate) {
-                r->headers_out.www_authenticate->hash = 0;
+            if (r->headers_out.www_authenticate.elts) {
+                wwauth = r->headers_out.www_authenticate.elts;
+
+                for (i = 0; i < r->headers_out.www_authenticate.nelts; i++) {
+                    wwauth[i]->hash = 0;
+                }
             }
 
             r->phase_handler = ph->next;

src/http/ngx_http_request.h

@@ -255 +255 @@
     ngx_table_elt_t                  *last_modified;
     ngx_table_elt_t                  *content_range;
     ngx_table_elt_t                  *accept_ranges;
-    ngx_table_elt_t                  *www_authenticate;
     ngx_table_elt_t                  *expires;
     ngx_table_elt_t                  *etag;
 
@@ -268 +267 @@
     ngx_uint_t                        content_type_hash;
 
     ngx_array_t                       cache_control;
+    ngx_array_t                       www_authenticate;
 
     off_t                             content_length_n;
     time_t                            date_time;

src/http/ngx_http_upstream.c

@@ -2010 +2010 @@
 {
     ngx_int_t                  status;
     ngx_uint_t                 i;
-    ngx_table_elt_t           *h;
+    ngx_table_elt_t           *h, **wwauth;
     ngx_http_err_page_t       *err_page;
     ngx_http_core_loc_conf_t  *clcf;
 
@@ -2048 +2048 @@
                 }
 
                 *h = *u->headers_in.www_authenticate;
-
-                r->headers_out.www_authenticate = h;
+                wwauth = r->headers_out.www_authenticate.elts;
+
+                if (wwauth == NULL) {
+                    if (ngx_array_init(&r->headers_out.www_authenticate,
+                                       r->pool, 1, 
+                                       sizeof(ngx_table_elt_t *)) != NGX_OK) {
+                        return NGX_ERROR;
+                    }
+
+                    wwauth = ngx_array_push(&r->headers_out.www_authenticate);
+
+                    if (wwauth == NULL) {
+                        return NGX_ERROR;
+                    }
+                }
+
+                *wwauth = h;
             }
 
 #if (NGX_HTTP_CACHE)