VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-13 14:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support Cache-Control: only-if-cached, as per RFC2616 14.9.4.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1023394 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Graham Leggett
2010-10-17 00:20:41 +00:00
parent fc7955190f
commit 7ce9abf618
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/cache/cache_storage.c vendored
View File

@ -304,6 +304,15 @@ int cache_select(cache_request_rec *cache, request_rec *r)
if (!fresh) {
const char *etag, *lastmod;
/* Cache-Control: only-if-cached and revalidation required, try
* the next provider
*/
if (cache->control_in.only_if_cached) {
/* try again with next cache type */
list = list->next;
continue;
}
ap_log_error(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, r->server,
"Cached response for %s isn't fresh. Adding/replacing "
"conditional request headers.", r->uri);
@ -387,6 +396,15 @@ int cache_select(cache_request_rec *cache, request_rec *r)
}
}
}
/* if Cache-Control: only-if-cached, and not cached, return 504 */
if (cache->control_in.only_if_cached) {
ap_log_error(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, r->server,
"cache: 'only-if-cached' requested and no cached entity, "
"returning 504 Gateway Timeout for: %s", r->uri);
return HTTP_GATEWAY_TIME_OUT;
}
return DECLINED;
}

8
modules/cache/mod_cache.c vendored
View File

@ -199,9 +199,7 @@ static int cache_quick_handler(request_rec *r, int lookup)
}
else {
/* error */
ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
"cache: error returned while checking for cached "
"file by '%s' cache", cache->provider_name);
return rv;
}
return DECLINED;
}
@ -478,9 +476,7 @@ static int cache_handler(request_rec *r)
}
else {
/* error */
ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
"cache: error returned while checking for cached "
"file by %s cache", cache->provider_name);
return rv;
}
return DECLINED;
}