svn commit: r1070128 - in /httpd/httpd/trunk: CHANGES modules/cache/mod_cache.c

[mi...@apache.org]

Author: minfrin
Date: Sat Feb 12 19:02:58 2011
New Revision: 1070128

URL: http://svn.apache.org/viewvc?rev=1070128&view=rev
Log:
mod_cache: When a bad Expires date is present, we need to behave as if
the Expires is in the past, not as if the Expires is missing. PR 16521.

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/cache/mod_cache.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1070128&r1=1070127&r2=1070128&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sat Feb 12 19:02:58 2011
@@ -2,6 +2,10 @@
 
 Changes with Apache 2.3.11
 
+  *) mod_cache: When a bad Expires date is present, we need to behave as if
+     the Expires is in the past, not as if the Expires is missing. PR 16521.
+     [Co-Advisor <co...@measurement-factory.com>]
+
   *) mod_cache: We must ignore quoted-string values that appear in a
      Cache-Control header. PR 50199. [Graham Leggett]
 

Modified: httpd/httpd/trunk/modules/cache/mod_cache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_cache.c?rev=1070128&r1=1070127&r2=1070128&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_cache.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_cache.c Sat Feb 12 19:02:58 2011
@@ -837,9 +837,7 @@ static int cache_save_filter(ap_filter_t
         exps = apr_table_get(r->headers_out, "Expires");
     }
     if (exps != NULL) {
-        if (APR_DATE_BAD == (exp = apr_date_parse_http(exps))) {
-            exps = NULL;
-        }
+        exp = apr_date_parse_http(exps);
     }
     else {
         exp = APR_DATE_BAD;