From: Sander Striker <striker@apache.org>
Date: Sun, 6 Mar 2005 12:43:42 +0000 (+0000)
Subject: * modules/cache/mod_cache.c
X-Git-Tag: 2.1.4~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11344ad83a2f996380db36bce223bc050eaf4901;p=thirdparty%2Fapache%2Fhttpd.git

* modules/cache/mod_cache.c

  (cache_url_handler): Tweak a few comments.

  (cache_save_filter): Add a FIXME for a corner case.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156304 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index d8e25dd0476..ecc196f9cf7 100644
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -96,7 +96,7 @@ static int cache_url_handler(request_rec *r, int lookup)
     /* find certain cache controlling headers */
     auth = apr_table_get(r->headers_in, "Authorization");
 
-    /* first things first - does the request allow us to return
+    /* First things first - does the request allow us to return
      * cached information at all? If not, just decline the request.
      *
      * Note that there is a big difference between not being allowed
@@ -114,7 +114,7 @@ static int cache_url_handler(request_rec *r, int lookup)
      */
     if (conf->ignorecachecontrol == 1 && auth == NULL) {
         ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
-                     "incoming request is asking for a uncached version of "
+                     "incoming request may be asking for a uncached version of "
                      "%s, but we know better and are ignoring it", url);
     }
     else {
@@ -271,6 +271,10 @@ static int cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in)
     /* If the request has Cache-Control: no-store from RFC 2616, don't store
      * unless CacheStoreNoStore is active.
      */
+    /* FIXME: The Cache-Control: no-store could have come in on a 304,
+     * FIXME: while the original request wasn't conditional.  IOW, we made the
+     * FIXME: the request conditional earlier to revalidate our cached response.
+     */
     cc_in = apr_table_get(r->headers_in, "Cache-Control");
     if (r->no_cache ||
         (!conf->store_nostore &&