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

diff --git a/CHANGES b/CHANGES
index cba349ebace65a59c1ac00a0afc5621e7a048d97..38b7c2563378522095e6375aac8deedaafbfd06a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_file_cache: mod_file_cache should be able to serve files that
+     haven't had a Content-Type set via e.g. mod_mime. [Eric Covener]
+
   *) core: Support the SINGLE_LISTEN_UNSERIALIZED_ACCEPT optimization
      on Linux kernel versions 3.x and above.  PR 55121.  [Bradley Heilbrun
      <apache heilbrun.org>]

diff --git a/modules/cache/mod_file_cache.c b/modules/cache/mod_file_cache.c
index 8ab3abe54b844a68aa0abb4f1e6d3caf9ce7e4bb..d77b8d28a5cedfb99e261379933c74eb616e1007 100644 (file)
--- 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;
     }