httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@locus.apache.org
Subject cvs commit: apache-1.3/src/modules/standard mod_mime.c
Date Tue, 12 Sep 2000 15:16:23 GMT
coar        00/09/12 08:16:22

  Modified:    src      CHANGES
               src/modules/standard mod_mime.c
  Log:
  	Fix process/merging of Remove* MIME directives.  They were
  	being merged for the ancestor record, not the descendant.
  
  PR:		5597
  Submitted by:	Sander van Zoest <sander@covalent.net>
  Reviewed by:	Ken Coar
  
  Revision  Changes    Path
  1.1572    +3 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1571
  retrieving revision 1.1572
  diff -u -u -r1.1571 -r1.1572
  --- CHANGES	2000/09/08 15:57:06	1.1571
  +++ CHANGES	2000/09/12 15:16:18	1.1572
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.13
   
  +  *) Fix processing/merging of Remove* MIME directives.
  +     PR #5597 [Sander van Zoest <sander@covalent.net>]
  +
     *) Fix merging of AddDefaultCharset directive.
        PR #5872 [Jun Kuriyama <kuriyama@imgsrc.co.jp>]
       
  
  
  
  1.56      +3 -3      apache-1.3/src/modules/standard/mod_mime.c
  
  Index: mod_mime.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_mime.c,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -u -r1.55 -r1.56
  --- mod_mime.c	2000/07/14 17:34:32	1.55
  +++ mod_mime.c	2000/09/12 15:16:21	1.56
  @@ -157,15 +157,15 @@
   
       suffix = (attrib_info *) add->handlers_remove->elts;
       for (i = 0; i < add->handlers_remove->nelts; i++) {
  -        ap_table_unset(base->handlers, suffix[i].name);
  +        ap_table_unset(new->handlers, suffix[i].name);
       }
       suffix = (attrib_info *) add->types_remove->elts;
       for (i = 0; i < add->types_remove->nelts; i++) {
  -        ap_table_unset(base->forced_types, suffix[i].name);
  +        ap_table_unset(new->forced_types, suffix[i].name);
       }
       suffix = (attrib_info *) add->encodings_remove->elts;
       for (i = 0; i < add->encodings_remove->nelts; i++) {
  -        ap_table_unset(base->encoding_types, suffix[i].name);
  +        ap_table_unset(new->encoding_types, suffix[i].name);
       }
   
       new->type = add->type ? add->type : base->type;
  
  
  

Mime
View raw message