Commit f15752f5 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  The two more Remove flavors needed testing, as well.  While I'm at it,
  add a reasonable explanation of why we are about to copy.


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

modules/http/mod_mime.c

+9 −3
Original line number Diff line number Diff line
@@ -251,9 +251,15 @@ static void *merge_mime_dir_configs(apr_pool_t *p, void *basev, void *addv) 
        else {

            new->extension_mappings = base->extension_mappings;

        }

        if (new->extension_mappings && (add->handlers_remove 

                                     || add->types_remove 

                                     || add->encodings_remove)) {

        /* We may not be merging the tables, but if we potentially will change

         * an exinfo member, then we are about to trounce it anyways.

         * We must have a copy for safety.

         */

        if (new->extension_mappings && (add->charsets_remove

                                     || add->encodings_remove

                                     || add->handlers_remove 

                                     || add->languages_remove 

                                     || add->types_remove)) {

            apr_hash_t *copyhash = new->extension_mappings;

            new->extension_mappings = apr_hash_make(p);

            overlay_extension_mappings(p, copyhash, new->extension_mappings);