Merge remote-tracking branch 'upstream/master'

Author: RekGRpth

src/ngx_http_push_stream_module_utils.c

@@ -2194,8 +2194,12 @@ 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;
+#if (nginx_version >= 1023000)
+    ngx_table_elt_t  *expires_header, *cc;
+#else
     ngx_uint_t        i;
     ngx_table_elt_t  *expires_header, *cc, **ccp;
+#endif
 
     expires_header = r->headers_out.expires;
 
@@ -2215,6 +2219,32 @@ 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;
 
+#if (nginx_version >= 1023000)
+    cc = r->headers_out.cache_control;
+
+    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");
+
+    } else {
+        for (cc = cc->next; cc; cc = cc->next) {
+            cc->hash = 0;
+        }
+
+        cc = r->headers_out.cache_control;
+        cc->next = NULL;
+    }
+#else
     ccp = r->headers_out.cache_control.elts;
 
     if (ccp == NULL) {
@@ -2244,6 +2274,8 @@ ngx_http_push_stream_set_expires(ngx_http_request_t *r, ngx_http_push_stream_exp
 
         cc = ccp[0];
     }
+#endif
+
 
     if (expires == NGX_HTTP_PUSH_STREAM_EXPIRES_EPOCH) {
         expires_header->value.data = (u_char *) "Thu, 01 Jan 1970 00:00:01 GMT";