svn commit: r1496711 - in /httpd/httpd/trunk: CHANGES modules/cache/mod_file_cache.c

[co...@apache.org]

Author: covener
Date: Wed Jun 26 02:32:39 2013
New Revision: 1496711

URL: http://svn.apache.org/r1496711
Log:
recognize the "defualt handler name" in r->handler, which is used when
no SetHandler/AddHandler and no matching mimetype during type_checker.


Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/cache/mod_file_cache.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1496711&r1=1496710&r2=1496711&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Wed Jun 26 02:32:39 2013
@@ -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>]

Modified: httpd/httpd/trunk/modules/cache/mod_file_cache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_file_cache.c?rev=1496711&r1=1496710&r2=1496711&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_file_cache.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_file_cache.c Wed Jun 26 02:32:39 2013
@@ -312,10 +312,10 @@ static int file_cache_handler(request_re
     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;
     }