httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r708902 - /httpd/httpd/trunk/modules/metadata/mod_expires.c
Date Wed, 29 Oct 2008 13:32:59 GMT
Author: jim
Date: Wed Oct 29 06:32:58 2008
New Revision: 708902

URL: http://svn.apache.org/viewvc?rev=708902&view=rev
Log:
Avoid time traveling :)

Modified:
    httpd/httpd/trunk/modules/metadata/mod_expires.c

Modified: httpd/httpd/trunk/modules/metadata/mod_expires.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/metadata/mod_expires.c?rev=708902&r1=708901&r2=708902&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/metadata/mod_expires.c (original)
+++ httpd/httpd/trunk/modules/metadata/mod_expires.c Wed Oct 29 06:32:58 2008
@@ -430,6 +430,9 @@
     }
 
     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)));



Mime
View raw message