You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by st...@apache.org on 2005/03/08 22:11:09 UTC
svn commit: r156567 - httpd/httpd/trunk/modules/cache/cache_util.c
Author: striker
Date: Tue Mar 8 13:11:07 2005
New Revision: 156567
URL: http://svn.apache.org/viewcvs?view=rev&rev=156567
Log:
Make IgnoreCacheControl do what it implies when it comes to requests and
freshness checks.
* modules/cache/cache_util.c
(ap_cache_check_freshness): Ignore CacheControl: max-age and min-fresh
if IgnoreCacheControl is set.
Modified:
httpd/httpd/trunk/modules/cache/cache_util.c
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=156566&r2=156567
==============================================================================
--- httpd/httpd/trunk/modules/cache/cache_util.c (original)
+++ httpd/httpd/trunk/modules/cache/cache_util.c Tue Mar 8 13:11:07 2005
@@ -122,6 +122,9 @@
char *val;
apr_time_t age_c = 0;
cache_info *info = &(h->cache_obj->info);
+ cache_server_conf *conf =
+ (cache_server_conf *)ap_get_module_config(r->server->module_config,
+ &cache_module);
/*
* We now want to check if our cached data is still fresh. This depends
@@ -162,9 +165,6 @@
if (ap_cache_liststr(NULL, pragma, "no-cache", NULL)
|| ap_cache_liststr(NULL, cc_req, "no-cache", NULL)) {
- cache_server_conf *conf =
- (cache_server_conf *)ap_get_module_config(r->server->module_config,
- &cache_module);
if (!conf->ignorecachecontrol) {
/* Treat as stale, causing revalidation */
@@ -172,7 +172,7 @@
}
ap_log_error(APLOG_MARK, APLOG_INFO, 0, r->server,
- "Incoming request may be asking for a uncached version of "
+ "Incoming request is asking for a uncached version of "
"%s, but we know better and are ignoring it",
r->unparsed_uri);
}
@@ -197,7 +197,8 @@
}
/* extract max-age from request */
- if (cc_req && ap_cache_liststr(r->pool, cc_req, "max-age", &val)) {
+ if (!conf->ignorecachecontrol
+ && cc_req && ap_cache_liststr(r->pool, cc_req, "max-age", &val)) {
maxage_req = apr_atoi64(val);
}
else {
@@ -234,7 +235,8 @@
}
/* extract min-fresh */
- if (cc_req && ap_cache_liststr(r->pool, cc_req, "min-fresh", &val)) {
+ if (!conf->ignorecachecontrol
+ && cc_req && ap_cache_liststr(r->pool, cc_req, "min-fresh", &val)) {
minfresh = apr_atoi64(val);
}
else {