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

  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


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

modules/http/mod_mime.c

+2 −14
Original line number Diff line number Diff line
@@ -192,21 +192,9 @@ static void overlay_extension_mappings(apr_pool_t *p, 
                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;

            }

            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;

            }

        }