You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2008/11/11 20:59:22 UTC
svn commit: r713142 - in /httpd/httpd/branches/2.2.x: ./ STATUS docs/
modules/metadata/mod_expires.c support/ab.c support/suexec.c
Author: jim
Date: Tue Nov 11 11:59:22 2008
New Revision: 713142
URL: http://svn.apache.org/viewvc?rev=713142&view=rev
Log:
Merge r708902 from trunk:
Avoid time traveling :)
Reviewed by: jim
Modified:
httpd/httpd/branches/2.2.x/ (props changed)
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/docs/ (props changed)
httpd/httpd/branches/2.2.x/modules/metadata/mod_expires.c
httpd/httpd/branches/2.2.x/support/ab.c (props changed)
httpd/httpd/branches/2.2.x/support/suexec.c (props changed)
Propchange: httpd/httpd/branches/2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 11 11:59:22 2008
@@ -1 +1 @@
-/httpd/httpd/trunk:451572,611483,639005,639010,647395,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693392,693727-693728,696006,697093,706318,711421
+/httpd/httpd/trunk:451572,611483,639005,639010,647395,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693392,693727-693728,696006,697093,706318,708902,711421
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=713142&r1=713141&r2=713142&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Tue Nov 11 11:59:22 2008
@@ -113,14 +113,6 @@
Trunk version of patch works
+1: rpluem, jim, pgollucci
- * mod_expires: Do not sets negative max-age / Expires header in the past.
- PR 39774 [Jim Jagielski]
- Trunk version of patch:
- http://svn.apache.org/viewvc?rev=708902&view=rev
- Backport version for 2.2.x of patch:
- Trunk version of patch works
- +1: rpluem, jim, pgollucci
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Propchange: httpd/httpd/branches/2.2.x/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 11 11:59:22 2008
@@ -1 +1 @@
-/httpd/httpd/trunk/docs:451572,611483,639005,639010,647395,660461,660566,664330,675610,678761,681190,682369,683626,684351,685112,686549,686805,686809,687099,687754,692325,693392,693727-693728,696006,697093,703441,703997,706318,711421
+/httpd/httpd/trunk/docs:451572,611483,639005,639010,647395,660461,660566,664330,675610,678761,681190,682369,683626,684351,685112,686549,686805,686809,687099,687754,692325,693392,693727-693728,696006,697093,703441,703997,706318,708902,711421
Modified: httpd/httpd/branches/2.2.x/modules/metadata/mod_expires.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/metadata/mod_expires.c?rev=713142&r1=713141&r2=713142&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/metadata/mod_expires.c (original)
+++ httpd/httpd/branches/2.2.x/modules/metadata/mod_expires.c Tue Nov 11 11:59:22 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)));
Propchange: httpd/httpd/branches/2.2.x/support/ab.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 11 11:59:22 2008
@@ -1 +1 @@
-/httpd/httpd/trunk/support/ab.c:83751-655654,657433,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693392,693727-693728,696006,697093,706318,711421
+/httpd/httpd/trunk/support/ab.c:83751-655654,657433,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693392,693727-693728,696006,697093,706318,708902,711421
Propchange: httpd/httpd/branches/2.2.x/support/suexec.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 11 11:59:22 2008
@@ -1 +1 @@
-/httpd/httpd/trunk/support/suexec.c:451572,611483,639005,639010,647395,655711,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693392,693727-693728,696006,697093,706318,711421
+/httpd/httpd/trunk/support/suexec.c:451572,611483,639005,639010,647395,655711,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693392,693727-693728,696006,697093,706318,708902,711421