Update the SetFilter directive to work with Handlers instead of MIME-types.

This also updates the docs to reflect the change.
Submitted by:	Joshua Slive
Reviewed by:	Ryan Bloom

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

diff --git a/docs/manual/mod/mod_mime.html b/docs/manual/mod/mod_mime.html
index c152f414fce3a1311f1c6af80449e2c208919d08..dd23695b7d352033305d5c437a528bff4177af08 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 MIME-type...</EM><BR>
+><STRONG>Syntax:</STRONG></A> SetFilter <EM>Assign filters based on Handler...</EM><BR>
 <A
  HREF="directive-dict.html#Context"
  REL="Help"
@@ -363,8 +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 content
-type.
+The SetFilter directive maps a filter stack to the specified Handler.
 </P>
 <P>
 Example: <BLOCKQUOTE><CODE>
@@ -372,15 +371,15 @@ SetFilter server-parsed INCLUDES CACHE
 </CODE></BLOCKQUOTE>
 </P>
 <P>
-Then any document with the server-parsed MIME-type will pass through the 
+Then any document with the server-parsed Handler 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="#addtype">
-AddType</A> or <A HREF="#addhandler">AddHandler</A> directives.  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
+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 
+MIME-type and a set of filters for files with those extensions to be passed 
+through
 </P>
 <PRE>
 AddHandler server-parsed .shtml

diff --git a/modules/http/mod_mime.c b/modules/http/mod_mime.c
index 32ecc16b1ed07866620630b1944c952af16b11a8..05f4b2edd33c631b78d79dedbb7d6e9d0ab16b79 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->content_type, NULL);
+    apr_table_do(filter_chain, r, conf->filter_names, r->handler, NULL);
 }
 
 static void register_hooks(void)