svn commit: r156304 - httpd/httpd/trunk/modules/cache/mod_cache.c

[st...@apache.org]

Author: striker
Date: Sun Mar  6 04:43:42 2005
New Revision: 156304

URL: http://svn.apache.org/viewcvs?view=rev&rev=156304
Log:
* modules/cache/mod_cache.c

  (cache_url_handler): Tweak a few comments.

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

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

Modified: httpd/httpd/trunk/modules/cache/mod_cache.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/mod_cache.c?view=diff&r1=156303&r2=156304
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_cache.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_cache.c Sun Mar  6 04:43:42 2005
@@ -96,7 +96,7 @@
     /* 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 @@
      */
     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 {
@@ -270,6 +270,10 @@
 
     /* 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 ||