nginx 1.23

Author: RekGRpth

src/ngx_http_push_stream_module_utils.c

@@ -2194,8 +2194,7 @@ ngx_http_push_stream_set_expires(ngx_http_request_t *r, ngx_http_push_stream_exp
 {
     size_t            len;
     time_t            now, expires_header_time, max_age;
-    ngx_uint_t        i;
-    ngx_table_elt_t  *expires_header, *cc, **ccp;
+    ngx_table_elt_t  *expires_header, *cc;
 
     expires_header = r->headers_out.expires;
 
@@ -2207,6 +2206,7 @@ ngx_http_push_stream_set_expires(ngx_http_request_t *r, ngx_http_push_stream_exp
         }
 
         r->headers_out.expires = expires_header;
+        expires_header->next = NULL;
 
         expires_header->hash = 1;
         ngx_str_set(&expires_header->key, "Expires");
@@ -2215,34 +2215,29 @@ ngx_http_push_stream_set_expires(ngx_http_request_t *r, ngx_http_push_stream_exp
     len = sizeof("Mon, 28 Sep 1970 06:00:00 GMT");
     expires_header->value.len = len - 1;
 
-    ccp = r->headers_out.cache_control.elts;
+    cc = r->headers_out.cache_control;
 
-    if (ccp == NULL) {
-
-        if (ngx_array_init(&r->headers_out.cache_control, r->pool, 1, sizeof(ngx_table_elt_t *)) != NGX_OK) {
-            return NGX_ERROR;
-        }
-
-        ccp = ngx_array_push(&r->headers_out.cache_control);
-        if (ccp == NULL) {
-            return NGX_ERROR;
-        }
+    if (cc == NULL) {
 
         cc = ngx_list_push(&r->headers_out.headers);
         if (cc == NULL) {
+            expires_header->hash = 0;
             return NGX_ERROR;
         }
 
+        r->headers_out.cache_control = cc;
+        cc->next = NULL;
+
         cc->hash = 1;
         ngx_str_set(&cc->key, "Cache-Control");
-        *ccp = cc;
 
     } else {
-        for (i = 1; i < r->headers_out.cache_control.nelts; i++) {
-            ccp[i]->hash = 0;
+        for (cc = cc->next; cc; cc = cc->next) {
+            cc->hash = 0;
         }
 
-        cc = ccp[0];
+        cc = r->headers_out.cache_control;
+        cc->next = NULL;
     }
 
     if (expires == NGX_HTTP_PUSH_STREAM_EXPIRES_EPOCH) {
@@ -2260,6 +2255,8 @@ ngx_http_push_stream_set_expires(ngx_http_request_t *r, ngx_http_push_stream_exp
 
     expires_header->value.data = ngx_pnalloc(r->pool, len);
     if (expires_header->value.data == NULL) {
+        expires_header->hash = 0;
+        cc->hash = 0;
         return NGX_ERROR;
     }
 
@@ -2276,8 +2273,8 @@ ngx_http_push_stream_set_expires(ngx_http_request_t *r, ngx_http_push_stream_exp
         max_age = expires_header_time - now;
 
     } else if (expires == NGX_HTTP_PUSH_STREAM_EXPIRES_ACCESS || r->headers_out.last_modified_time == -1) {
-        expires_header_time = now + expires_time;
         max_age = expires_time;
+        expires_header_time = now + expires_time;
 
     } else {
         expires_header_time = r->headers_out.last_modified_time + expires_time;
@@ -2293,6 +2290,7 @@ ngx_http_push_stream_set_expires(ngx_http_request_t *r, ngx_http_push_stream_exp
 
     cc->value.data = ngx_pnalloc(r->pool, sizeof("max-age=") + NGX_TIME_T_LEN + 1);
     if (cc->value.data == NULL) {
+        cc->hash = 0;
         return NGX_ERROR;
     }