Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 16 Aug 2001 21:23:29 -0000
Message-ID: <20010816212329.88362.qmail@icarus.apache.org>
From: wrowe@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/modules/http mod_mime.c
Status: O

wrowe       01/08/16 14:23:29

  Modified:    modules/http mod_mime.c
  Log:
    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.
  
  Revision  Changes    Path
  1.54      +9 -3      httpd-2.0/modules/http/mod_mime.c
  
  Index: mod_mime.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/mod_mime.c,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- mod_mime.c	2001/08/16 20:04:32	1.53
  +++ mod_mime.c	2001/08/16 21:23:29	1.54
  @@ -251,9 +251,15 @@
           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);