Get SetFilter working with MIME-types again and update the docs

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

diff --git a/docs/manual/mod/mod_mime.html b/docs/manual/mod/mod_mime.html
index dd23695b7d352033305d5c437a528bff4177af08..ef3d31bd6c9dbed79668c4359cf582651eee7c3f 100644 (file)
--- a/docs/manual/mod/mod_mime.html
+++ b/docs/manual/mod/mod_mime.html
@@ -344,7 +344,7 @@ HREF="./mod_negotiation.html">mod_negotiation</A>
 <A
  HREF="directive-dict.html#Syntax"
  REL="Help"
-><STRONG>Syntax:</STRONG></A> SetFilter <EM>Assign filters based on Handler...</EM><BR>
+><STRONG>Syntax:</STRONG></A> SetFilter <EM>Assign filters based on MIME-type...</EM><BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"
@@ -363,7 +363,7 @@ HREF="./mod_negotiation.html">mod_negotiation</A>
 ><STRONG>Module:</STRONG></A> mod_mime
 
 <P>
-The SetFilter directive maps a filter stack to the specified Handler.
+The SetFilter directive maps a filter stack to the specified MIME-type.
 </P>
 <P>
 Example: <BLOCKQUOTE><CODE>
@@ -371,19 +371,18 @@ SetFilter server-parsed INCLUDES CACHE
 </CODE></BLOCKQUOTE>
 </P>
 <P>
-Then any document with the server-parsed Handler will pass through the 
+Then any document with the server-parsed MIME-type will pass through the 
 INCLUDES and CACHE filters.  The filters are added in the same order that 
 they are specified in the config file.
 </P>
 <P>
-This can be very powerful when combined with either the <A HREF="#addhandler">
-AddHandler</A> directives.  This allows you to specify an extension for a 
+This can be very powerful when combined with the <A HREF="#addtype">
+AddType</A> directive.  This allows you to specify an extension for a 
 MIME-type and a set of filters for files with those extensions to be passed 
 through
 </P>
 <PRE>
-AddHandler server-parsed .shtml
-SetFilter server-parsed INCLUDES 
+SetFilter text/html INCLUDES 
 </PRE>
 <P>
 documents with the extension "<CODE>.shtml</CODE>" would be passed through

diff --git a/modules/http/mod_mime.c b/modules/http/mod_mime.c
index 05f4b2edd33c631b78d79dedbb7d6e9d0ab16b79..32ecc16b1ed07866620630b1944c952af16b11a8 100644 (file)
--- a/modules/http/mod_mime.c
+++ b/modules/http/mod_mime.c
@@ -837,7 +837,7 @@ static void mime_insert_filter(request_rec *r)
     mime_dir_config *conf =
     (mime_dir_config *) ap_get_module_config(r->per_dir_config, &mime_module);
 
-    apr_table_do(filter_chain, r, conf->filter_names, r->handler, NULL);
+    apr_table_do(filter_chain, r, conf->filter_names, r->content_type, NULL);
 }
 
 static void register_hooks(void)