From: Jeff Trawick <trawick@apache.org>
Date: Mon, 18 Sep 2000 12:17:29 +0000 (+0000)
Subject: Fix some problems with the recent port of RemoveEncoding and
X-Git-Tag: APACHE_2_0_ALPHA_7~144
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cc301503a1bce80cbccbd64d7ff31c9f3c1ba4f4;p=apache

Fix some problems with the recent port of RemoveEncoding and
RemoveType to 2.0.  (--with-maintainer-mode works wonders!)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86248 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/http/mod_mime.c b/modules/http/mod_mime.c
index 49c3457c90..1e81ea8248 100644
--- a/modules/http/mod_mime.c
+++ b/modules/http/mod_mime.c
@@ -288,7 +288,7 @@ static const char *remove_handler(cmd_parms *cmd, void *m, const char *ext)
  * Just like the previous function, except that it records encoding
  * associations to be undone.
  */
-static const char *remove_encoding(cmd_parms *cmd, void *m, char *ext)
+static const char *remove_encoding(cmd_parms *cmd, void *m, const char *ext)
 {
     mime_dir_config *mcfg = (mime_dir_config *) m;
     attrib_info *suffix;
@@ -305,7 +305,7 @@ static const char *remove_encoding(cmd_parms *cmd, void *m, char *ext)
  * Similar to the previous functions, except that it deals with filename
  * suffix/MIME-type associations.
  */
-static const char *remove_type(cmd_parms *cmd, void *m, char *ext)
+static const char *remove_type(cmd_parms *cmd, void *m, const char *ext)
 {
     mime_dir_config *mcfg = (mime_dir_config *) m;
     attrib_info *suffix;
@@ -347,9 +347,9 @@ AP_INIT_TAKE1("ForceType", ap_set_string_slot_lower,
      "a media type"),
 AP_INIT_ITERATE("RemoveHandler", remove_handler, NULL, OR_FILEINFO,
      "one or more file extensions"),
-AP_INIT_ITERATE("RemoveEncoding", remove_handler, NULL, OR_FILEINFO,
+AP_INIT_ITERATE("RemoveEncoding", remove_encoding, NULL, OR_FILEINFO,
      "one or more file extensions"),
-AP_INIT_ITERATE("RemoveType", remove_handler, NULL, OR_FILEINFO,
+AP_INIT_ITERATE("RemoveType", remove_type, NULL, OR_FILEINFO,
      "one or more file extensions"),
 AP_INIT_TAKE1("SetHandler", ap_set_string_slot_lower, 
      (void *)XtOffsetOf(mime_dir_config, handler), OR_FILEINFO,