From 63066cda296e94257a68903a0cce42d73b027b8b Mon Sep 17 00:00:00 2001 From: Ken Coar Date: Tue, 6 Jun 2000 20:39:50 +0000 Subject: [PATCH] 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 --- modules/metadata/mod_expires.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/metadata/mod_expires.c b/modules/metadata/mod_expires.c index 1a87060148..dff1dbe42b 100644 --- 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); -- 2.40.0