summaryrefslogtreecommitdiffstats
path: root/modules/cache
diff options
context:
space:
mode:
authorEric Covener <covener@apache.org>2013-06-26 04:32:39 +0200
committerEric Covener <covener@apache.org>2013-06-26 04:32:39 +0200
commit7df09b69d48c8b8ec89f43a18ff50abc2d48cbe3 (patch)
treee3d24894b6d7be65aa46c4cdd7df3adecf703c0e /modules/cache
parentfactor out DEFAULT_HANDLER_NAME (diff)
downloadapache2-7df09b69d48c8b8ec89f43a18ff50abc2d48cbe3.tar.xz
apache2-7df09b69d48c8b8ec89f43a18ff50abc2d48cbe3.zip
recognize the "defualt handler name" in r->handler, which is used when
no SetHandler/AddHandler and no matching mimetype during type_checker. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1496711 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/cache')
-rw-r--r--modules/cache/mod_file_cache.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/cache/mod_file_cache.c b/modules/cache/mod_file_cache.c
index 8ab3abe54b..d77b8d28a5 100644
--- a/modules/cache/mod_file_cache.c
+++ b/modules/cache/mod_file_cache.c
@@ -312,10 +312,10 @@ static int file_cache_handler(request_rec *r)
int errstatus;
int rc = OK;
- /* XXX: not sure if this is right yet
- * see comment in http_core.c:default_handler
- */
- if (ap_strcmp_match(r->handler, "*/*")) {
+ /* Bail out if r->handler isn't the default value, and doesn't look like a Content-Type
+ * XXX: Even though we made the user explicitly list each path to cache?
+ */
+ if (ap_strcmp_match(r->handler, "*/*") && !AP_IS_DEFAULT_HANDLER_NAME(r->handler)) {
return DECLINED;
}