httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject svn commit: r156401 - in httpd/httpd/trunk: CHANGES modules/cache/cache_util.c
Date Mon, 07 Mar 2005 07:18:36 GMT
Author: jerenkrantz
Date: Sun Mar  6 23:18:34 2005
New Revision: 156401

URL: http://svn.apache.org/viewcvs?view=rev&rev=156401
Log:
* modules/cache/cache_util.c (ap_cache_check_freshness): Use r->headers_in not
  the stored headers for the Cache-Control check.

Pointed out by: Sander Striker

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

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?view=diff&r1=156400&r2=156401
==============================================================================
--- httpd/httpd/trunk/CHANGES (original)
+++ httpd/httpd/trunk/CHANGES Sun Mar  6 23:18:34 2005
@@ -2,6 +2,9 @@
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) mod_cache: Fix error where incoming Cache-Control would be ignored.
+     [Justin Erenkrantz]
+
   *) worker MPM/mod_status: Support per-worker tracking of pid and
      generation in the scoreboard so that mod_status can accurately
      represent workers in processes which are gracefully terminating.

Modified: httpd/httpd/trunk/modules/cache/cache_util.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/cache_util.c?view=diff&r1=156400&r2=156401
==============================================================================
--- httpd/httpd/trunk/modules/cache/cache_util.c (original)
+++ httpd/httpd/trunk/modules/cache/cache_util.c Sun Mar  6 23:18:34 2005
@@ -165,8 +165,11 @@
      * entity, and it's value is in the past, it has expired.
      * 
      */
+    /* This value comes from the client's initial request. */
+    cc_req = apr_table_get(r->headers_in, "Cache-Control");
+
+    /* These come from the cached entity. */
     cc_cresp = apr_table_get(h->resp_hdrs, "Cache-Control");
-    cc_req = apr_table_get(h->req_hdrs, "Cache-Control");
     expstr = apr_table_get(h->resp_hdrs, "Expires");
 
     if ((agestr = apr_table_get(h->resp_hdrs, "Age"))) {



Mime
View raw message