Bring forward a fix from 1.3.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85446 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/metadata/mod_expires.c b/modules/metadata/mod_expires.c
index 1a870601485885ab3a4a1d8be2ae3c49549c2066..dff1dbe42b239f4c8235998b843e11811b8a44df 100644 (file)
--- a/modules/metadata/mod_expires.c
+++ b/modules/metadata/mod_expires.c
@@ -483,9 +483,10 @@ static int add_expires(request_rec *r)
     };
 
     expires = base + additional;
-    ap_table_setn(r->headers_out, "Cache-Control",
-       ap_psprintf(r->pool, "max-age=%qd",
-           (expires - r->request_time) / AP_USEC_PER_SEC));
+    ap_table_mergen(r->headers_out, "Cache-Control",
+                   ap_psprintf(r->pool, "max-age=%qd",
+                               (expires - r->request_time)
+                                   / AP_USEC_PER_SEC));
     timestr = ap_palloc(r->pool, AP_RFC822_DATE_LEN);
     ap_rfc822_date(timestr, expires);
     ap_table_setn(r->headers_out, "Expires", timestr);