From: William A. Rowe Jr <wrowe@apache.org>
Date: Wed, 15 Aug 2001 03:09:32 +0000 (+0000)
Subject:   Solve the segfault until the right patch is unearthed.
X-Git-Tag: 2.0.24~96
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5e3e42e250c91689f9d0d1a18de91e3b4fb7b300;p=apache

  Solve the segfault until the right patch is unearthed.
  [Greg Ames]


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

diff --git a/modules/http/mod_mime.c b/modules/http/mod_mime.c
index b220532576..38a0d4b61c 100644
--- a/modules/http/mod_mime.c
+++ b/modules/http/mod_mime.c
@@ -220,13 +220,13 @@ static void *merge_mime_dir_configs(apr_pool_t *p, void *basev, void *addv)
     attrib_info *suffix;
 
     if (base->extension_mappings && add->extension_mappings) {
-        if (base->copy_mappings)
-            new->extension_mappings = base->extension_mappings;
-        else {
+        /* XXX: Greg Ames' fast hack to always copy the hash.
+         * It's incomplete, and slower than tables, but at least
+         * the server (mostly) runs once again.
+         */
             new->extension_mappings = apr_hash_make(p);
             overlay_extension_mappings(p, base->extension_mappings,
                                        new->extension_mappings);
-        }
         overlay_extension_mappings(p, add->extension_mappings,
                                    new->extension_mappings);
         new->copy_mappings = 1;