Port the fix for Remove Handler from 1.3 to 2.0

Submitted by:	Sander van Zoest <sander@covalent.net>
Reviewed by:	Ryan Bloom

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

diff --git a/modules/http/mod_mime.c b/modules/http/mod_mime.c
index 1e81ea824822550449cecfd085409480d28e1373..4308df6411dd0173eac998bdcc99cd60966b1cbc 100644 (file)
--- a/modules/http/mod_mime.c
+++ b/modules/http/mod_mime.c
@@ -176,17 +176,17 @@ static void *merge_mime_dir_configs(apr_pool_t *p, void *basev, void *addv)
 
     suffix = (attrib_info *) add->handlers_remove->elts;
     for (i = 0; i < add->handlers_remove->nelts; i++) {
-        apr_table_unset(base->handlers, suffix[i].name);
+        apr_table_unset(new->handlers, suffix[i].name);
     }
 
     suffix = (attrib_info *) add->types_remove->elts;
     for (i = 0; i < add->types_remove->nelts; i++) {
-        apr_table_unset(base->forced_types, suffix[i].name);
+        apr_table_unset(new->forced_types, suffix[i].name);
     }
 
     suffix = (attrib_info *) add->encodings_remove->elts;
     for (i = 0; i < add->encodings_remove->nelts; i++) {
-        apr_table_unset(base->encoding_types, suffix[i].name);
+        apr_table_unset(new->encoding_types, suffix[i].name);
     }