You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2010/09/04 17:20:30 UTC
svn commit: r992625 - in /httpd/httpd/trunk: CHANGES
modules/cache/cache_storage.c modules/cache/cache_util.c
modules/cache/mod_cache.h
Author: minfrin
Date: Sat Sep 4 15:20:30 2010
New Revision: 992625
URL: http://svn.apache.org/viewvc?rev=992625&view=rev
Log:
mod_cache: Check the request to determine whether we are allowed
to return cached content at all, and respect a "Cache-Control:
no-cache" header from a client. Previously, "no-cache" would
behave like "max-age=0".
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/modules/cache/cache_storage.c
httpd/httpd/trunk/modules/cache/cache_util.c
httpd/httpd/trunk/modules/cache/mod_cache.h
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=992625&r1=992624&r2=992625&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sat Sep 4 15:20:30 2010
@@ -2,6 +2,11 @@
Changes with Apache 2.3.9
+ *) mod_cache: Check the request to determine whether we are allowed
+ to return cached content at all, and respect a "Cache-Control:
+ no-cache" header from a client. Previously, "no-cache" would
+ behave like "max-age=0". [Graham Leggett]
+
*) mod_cache: Use a proper filter context to hold filter data instead
of misusing the per-request configuration. Fixes a segfault on trunk
when the normal handler is used. [Graham Leggett]
Modified: httpd/httpd/trunk/modules/cache/cache_storage.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/cache_storage.c?rev=992625&r1=992624&r2=992625&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/cache_storage.c (original)
+++ httpd/httpd/trunk/modules/cache/cache_storage.c Sat Sep 4 15:20:30 2010
@@ -203,6 +203,11 @@ int cache_select(request_rec *r)
if (rv != APR_SUCCESS) {
return rv;
}
+
+ if (!ap_cache_check_allowed(r)) {
+ return DECLINED;
+ }
+
/* go through the cache types till we get a match */
h = apr_palloc(r->pool, sizeof(cache_handle_t));
Modified: httpd/httpd/trunk/modules/cache/cache_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/cache_util.c?rev=992625&r1=992624&r2=992625&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/cache_util.c (original)
+++ httpd/httpd/trunk/modules/cache/cache_util.c Sat Sep 4 15:20:30 2010
@@ -380,6 +380,64 @@ CACHE_DECLARE(apr_status_t) ap_cache_rem
return apr_file_remove(lockname, r->pool);
}
+CACHE_DECLARE(int) ap_cache_check_allowed(request_rec *r) {
+ const char *cc_cresp, *cc_req;
+ const char *pragma;
+ cache_server_conf *conf =
+ (cache_server_conf *)ap_get_module_config(r->server->module_config,
+ &cache_module);
+
+ /*
+ * At this point, we may have data cached, but the request may have
+ * specified that cached data may not be used in a response.
+ *
+ * This is covered under RFC2616 section 14.9.4 (Cache Revalidation and
+ * Reload Controls).
+ *
+ * - RFC2616 14.9.4 End to end reload, Cache-Control: no-cache, or Pragma:
+ * no-cache. The server MUST NOT use a cached copy when responding to such
+ * a request.
+ *
+ * - RFC2616 14.9.2 What May be Stored by Caches. If Cache-Control:
+ * no-store arrives, do not serve from the cache.
+ */
+
+ /* This value comes from the client's initial request. */
+ cc_req = apr_table_get(r->headers_in, "Cache-Control");
+ pragma = apr_table_get(r->headers_in, "Pragma");
+
+ if (ap_cache_liststr(NULL, pragma, "no-cache", NULL)
+ || ap_cache_liststr(NULL, cc_req, "no-cache", NULL)) {
+
+ if (!conf->ignorecachecontrol) {
+ return 0;
+ }
+ else {
+ ap_log_error(APLOG_MARK, APLOG_INFO, 0, r->server,
+ "Incoming request is asking for an uncached version of "
+ "%s, but we have been configured to ignore it and serve "
+ "cached content anyway", r->unparsed_uri);
+ }
+ }
+
+ if (ap_cache_liststr(NULL, cc_req, "no-store", NULL)) {
+
+ if (!conf->ignorecachecontrol) {
+ /* We're not allowed to serve a cached copy */
+ return 0;
+ }
+ else {
+ ap_log_error(APLOG_MARK, APLOG_INFO, 0, r->server,
+ "Incoming request is asking for a no-store version of "
+ "%s, but we have been configured to ignore it and serve "
+ "cached content anyway", r->unparsed_uri);
+ }
+ }
+
+ return 1;
+}
+
+
CACHE_DECLARE(int) ap_cache_check_freshness(cache_handle_t *h,
request_rec *r)
{
@@ -402,10 +460,11 @@ CACHE_DECLARE(int) ap_cache_check_freshn
* We now want to check if our cached data is still fresh. This depends
* on a few things, in this order:
*
- * - RFC2616 14.9.4 End to end reload, Cache-Control: no-cache. no-cache in
- * either the request or the cached response means that we must
- * revalidate the request unconditionally, overriding any expiration
- * mechanism. It's equivalent to max-age=0,must-revalidate.
+ * - RFC2616 14.9.4 End to end reload, Cache-Control: no-cache. no-cache
+ * in either the request or the cached response means that we must
+ * perform the request unconditionally, and ignore cached content. We
+ * should never reach here, but if we do, mark the content as stale,
+ * as this is the best we can do.
*
* - RFC2616 14.32 Pragma: no-cache This is treated the same as
* Cache-Control: no-cache.
@@ -445,7 +504,8 @@ CACHE_DECLARE(int) ap_cache_check_freshn
ap_log_error(APLOG_MARK, APLOG_INFO, 0, r->server,
"Incoming request is asking for a uncached version of "
- "%s, but we know better and are ignoring it",
+ "%s, but we have been configured to ignore it and "
+ "serve a cached response anyway",
r->unparsed_uri);
}
Modified: httpd/httpd/trunk/modules/cache/mod_cache.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_cache.h?rev=992625&r1=992624&r2=992625&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_cache.h (original)
+++ httpd/httpd/trunk/modules/cache/mod_cache.h Sat Sep 4 15:20:30 2010
@@ -288,6 +288,15 @@ CACHE_DECLARE(apr_time_t) ap_cache_curre
CACHE_DECLARE(int) ap_cache_check_freshness(cache_handle_t *h, request_rec *r);
/**
+ * Check the whether the request allows a cached object to be served as per RFC2616
+ * section 14.9.4 (Cache Revalidation and Reload Controls)
+ * @param h cache_handle_t
+ * @param r request_rec
+ * @return 0 ==> cache object may not be served, 1 ==> cache object may be served
+ */
+CACHE_DECLARE(int) ap_cache_check_allowed(request_rec *r);
+
+/**
* Try obtain a cache wide lock on the given cache key.
*
* If we return APR_SUCCESS, we obtained the lock, and we are clear to
Re: svn commit: r992625 - in /httpd/httpd/trunk: CHANGES modules/cache/cache_storage.c modules/cache/cache_util.c modules/cache/mod_cache.h
Posted by Graham Leggett <mi...@sharp.fm>.
On 05 Sep 2010, at 7:05 PM, Ruediger Pluem wrote:
> Nitpicking: IMHO we are changing a public API. Where is the minor
> bump?
Thanks for the catch, it's in r996311.
Regards,
Graham
--
Re: svn commit: r992625 - in /httpd/httpd/trunk: CHANGES modules/cache/cache_storage.c
modules/cache/cache_util.c modules/cache/mod_cache.h
Posted by Ruediger Pluem <rp...@apache.org>.
On 09/04/2010 05:20 PM, minfrin@apache.org wrote:
> Author: minfrin
> Date: Sat Sep 4 15:20:30 2010
> New Revision: 992625
>
> URL: http://svn.apache.org/viewvc?rev=992625&view=rev
> Log:
> mod_cache: Check the request to determine whether we are allowed
> to return cached content at all, and respect a "Cache-Control:
> no-cache" header from a client. Previously, "no-cache" would
> behave like "max-age=0".
>
> Modified:
> httpd/httpd/trunk/CHANGES
> httpd/httpd/trunk/modules/cache/cache_storage.c
> httpd/httpd/trunk/modules/cache/cache_util.c
> httpd/httpd/trunk/modules/cache/mod_cache.h
>
> Modified: httpd/httpd/trunk/modules/cache/mod_cache.h
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_cache.h?rev=992625&r1=992624&r2=992625&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/cache/mod_cache.h (original)
> +++ httpd/httpd/trunk/modules/cache/mod_cache.h Sat Sep 4 15:20:30 2010
> @@ -288,6 +288,15 @@ CACHE_DECLARE(apr_time_t) ap_cache_curre
> CACHE_DECLARE(int) ap_cache_check_freshness(cache_handle_t *h, request_rec *r);
>
> /**
> + * Check the whether the request allows a cached object to be served as per RFC2616
> + * section 14.9.4 (Cache Revalidation and Reload Controls)
> + * @param h cache_handle_t
> + * @param r request_rec
> + * @return 0 ==> cache object may not be served, 1 ==> cache object may be served
> + */
> +CACHE_DECLARE(int) ap_cache_check_allowed(request_rec *r);
> +
> +/**
Nitpicking: IMHO we are changing a public API. Where is the minor bump?
Regards
Rüdiger