httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r892258 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/http/mod_mime.c
Date Fri, 18 Dec 2009 14:10:56 GMT
Author: jim
Date: Fri Dec 18 14:10:56 2009
New Revision: 892258

URL: http://svn.apache.org/viewvc?rev=892258&view=rev
Log:
Merge r821298 from trunk:

Make RemoveType override the info from TypesConfig

Submitted by: sf
Reviewed/backported by: jim

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/http/mod_mime.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=892258&r1=892257&r2=892258&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Fri Dec 18 14:10:56 2009
@@ -8,6 +8,9 @@
      control is still vulnerable, unless using OpenSSL >= 0.9.8l.  
      [Joe Orton, Ruediger Pluem]
 
+   *) mod_mime: Make RemoveType override the info from TypesConfig.
+      PR 38330. [Stefan Fritsch]
+
    *) Proxy: unable to connect to a backend is SERVICE_UNAVAILABLE,
       rather than BAD_GATEWAY or (especially) NOT_FOUND.
       PR 46971 [evanc nortel.com]

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=892258&r1=892257&r2=892258&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri Dec 18 14:10:56 2009
@@ -87,12 +87,6 @@
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * mod_mime: Make RemoveType override the info from TypesConfig
-    PR 38330.
-    Trunk Patch: http://svn.apache.org/viewvc?rev=821298&view=rev
-    2.2.x Patch: trunk patch works with some offset (except for CHANGES)
-    +1: sf, rpluem, rjung, jim
-
   * build: fix --with-module option to work as documented
     PR 43881
     Patch: http://svn.apache.org/viewvc?rev=880794&view=rev

Modified: httpd/httpd/branches/2.2.x/modules/http/mod_mime.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/http/mod_mime.c?rev=892258&r1=892257&r2=892258&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/http/mod_mime.c (original)
+++ httpd/httpd/branches/2.2.x/modules/http/mod_mime.c Fri Dec 18 14:10:56 2009
@@ -274,6 +274,16 @@
 }
 
 /*
+ * As RemoveType should also override the info from TypesConfig, we add an
+ * empty string as type instead of actually removing the type.
+ */
+static const char *remove_extension_type(cmd_parms *cmd, void *m_,
+                                         const char *ext)
+{
+    return add_extension_info(cmd, m_, "", ext);
+}
+
+/*
  * Note handler names are un-added with each per_dir_config merge.
  * This keeps the association from being inherited, but not
  * from being re-added at a subordinate level.
@@ -403,7 +413,7 @@
     AP_INIT_ITERATE("RemoveOutputFilter", remove_extension_info,
         (void *)APR_OFFSETOF(extension_info, output_filters), OR_FILEINFO,
         "one or more file extensions"),
-    AP_INIT_ITERATE("RemoveType", remove_extension_info,
+    AP_INIT_ITERATE("RemoveType", remove_extension_type,
         (void *)APR_OFFSETOF(extension_info, forced_type), OR_FILEINFO,
         "one or more file extensions"),
     AP_INIT_TAKE1("TypesConfig", set_types_config, NULL, RSRC_CONF,
@@ -815,7 +825,8 @@
 
         if (exinfo != NULL) {
 
-            if (exinfo->forced_type) {
+            /* empty string is treated as special case for RemoveType */
+            if (exinfo->forced_type && *exinfo->forced_type) {
                 ap_set_content_type(r, exinfo->forced_type);
                 found = 1;
             }



Mime
View raw message