You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2011/12/22 22:58:54 UTC

svn commit: r1222477 - in /httpd/httpd/branches/2.4.x: ./ docs/manual/mod/mod_mime.xml

Author: minfrin
Date: Thu Dec 22 21:58:54 2011
New Revision: 1222477

URL: http://svn.apache.org/viewvc?rev=1222477&view=rev
Log:
Backport:
Clarify how the filters are merged when defined using the AddOuputFilter
directive.

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_mime.xml

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 22 21:58:54 2011
@@ -1,3 +1,3 @@
 /httpd/httpd/branches/revert-ap-ldap:1150158-1150173
 /httpd/httpd/branches/wombat-integration:723609-723841
-/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130,1210219,1210221,1210252,1210284,1210378,1210725,1210892,1210951,1210954,1211528,1211663,1211680,1212883,1213338,1213567,1214003,1214005,1214015,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221292,1222335
+/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130,1210219,1210221,1210252,1210284,1210378,1210725,1210892,1210951,1210954,1211528,1211663,1211680,1212883,1213338,1213567,1214003,1214005,1214015,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221292,1222335,1222473

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_mime.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_mime.xml?rev=1222477&r1=1222476&r2=1222477&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_mime.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_mime.xml Thu Dec 22 21:58:54 2011
@@ -507,6 +507,41 @@ later.</compatibility>
     href="#multipleext">multiple extensions</a> and the
     <var>extension</var> argument will be compared against each of
     them.</p>
+
+    <p>Note that when defining a set of filters using the
+    <directive module="mod_mime">AddOuputFilter</directive> directive,
+    any definition made will replace any previous definition made by
+    the <directive module="mod_mime">AddOuputFilter</directive>
+    directive.</p>
+
+    <example>
+    # Effective filter "DEFLATE"<br />
+    AddOutputFilter DEFLATE shtml<br />
+    &lt;Location /foo&gt;<br />
+      <indent>
+      # Effective filter "INCLUDES", replacing "DEFLATE"<br />
+      AddOutputFilter INCLUDES shtml<br />
+      </indent>
+    &lt;/Location&gt;<br />
+    &lt;Location /bar&gt;<br />
+      <indent>
+      # Effective filter "INCLUDES;DEFLATE", replacing "DEFLATE"<br />
+      AddOutputFilter INCLUDES;DEFLATE shtml<br />
+      </indent>
+    &lt;/Location&gt;<br />
+    &lt;Location /bar/baz&gt;<br />
+      <indent>
+      # Effective filter "BUFFER", replacing "INCLUDES;DEFLATE"<br />
+      AddOutputFilter BUFFER shtml<br />
+      </indent>
+    &lt;/Location&gt;<br />
+    &lt;Location /bar/baz/buz&gt;<br />
+      <indent>
+      # No effective filter, replacing "BUFFER"<br />
+      RemoveOutputFilter shtml<br />
+      </indent>
+    &lt;/Location&gt;
+    </example>
 </usage>
 <seealso><directive module="mod_mime">RemoveOutputFilter</directive></seealso>
 <seealso><directive module="core">SetOutputFilter</directive></seealso>