httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/modules/http mod_mime.c
Date Sat, 08 Sep 2001 05:50:12 GMT
wrowe       01/09/07 22:50:12

  Modified:    modules/http mod_mime.c
  Log:
    The per_dir_merge overlay of AddInputFilter/AddOutputFilter must
    absolutely replace a prior definition for the same file extension.
    Picture AddOutputFilter Includes .html in a directory, and needing
    to replace that behavior in a subdirectory which does not contain
    SSI html files.  This behavior must remain consistent to the other
    mime behaviors, as documented in manual/mod/mod_mime.html
  
  Revision  Changes    Path
  1.63      +2 -14     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.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- mod_mime.c	2001/09/02 08:34:45	1.62
  +++ mod_mime.c	2001/09/08 05:50:12	1.63
  @@ -192,22 +192,10 @@
                   base_info->charset_type = overlay_info->charset_type;
               }
               if (overlay_info->input_filters) {
  -                /* We need to concat the filters */
  -                if (base_info->input_filters)
  -                    base_info->input_filters = apr_pstrcat(p, 
  -                                            base_info->input_filters, ";", 
  -                                            overlay_info->input_filters, NULL);
  -                else
  -                    base_info->input_filters = overlay_info->input_filters;
  +                base_info->input_filters = overlay_info->input_filters;
               }
               if (overlay_info->output_filters) {
  -                /* We need to concat the filters */
  -                if (base_info->output_filters)
  -                    base_info->output_filters = apr_pstrcat(p, 
  -                                           base_info->output_filters, ";", 
  -                                           overlay_info->output_filters, NULL);
  -                else
  -                    base_info->output_filters = overlay_info->output_filters;
  +                base_info->output_filters = overlay_info->output_filters;
               }
           }
           else {
  
  
  

Mime
View raw message