From e0a8365ead9cf932e6b8a96cb8f698b132a42419 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Wed, 29 Oct 2008 13:32:58 +0000 Subject: [PATCH] Avoid time traveling :) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@708902 13f79535-47bb-0310-9956-ffa450edef68 --- modules/metadata/mod_expires.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/metadata/mod_expires.c b/modules/metadata/mod_expires.c index 984ee9312a7..16a4ff0b42d 100644 --- a/modules/metadata/mod_expires.c +++ b/modules/metadata/mod_expires.c @@ -430,6 +430,9 @@ static int set_expiration_fields(request_rec *r, const char *code, } expires = base + additional; + if (expires < r->request_time) { + expires = r->request_time; + } apr_table_mergen(t, "Cache-Control", apr_psprintf(r->pool, "max-age=%" APR_TIME_T_FMT, apr_time_sec(expires - r->request_time))); -- 2.47.2