From: Daniel Gruno Date: Thu, 26 Apr 2012 17:55:47 +0000 (+0000) Subject: Syntax fixups for mod_f*.xml X-Git-Tag: 2.5.0-alpha~7000 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=037f22e0942ad7b1547faaffe2592e6ba2c169bf;p=apache Syntax fixups for mod_f*.xml git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1330994 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mod_file_cache.xml b/docs/manual/mod/mod_file_cache.xml index d5d10c899b..aacc991655 100644 --- a/docs/manual/mod/mod_file_cache.xml +++ b/docs/manual/mod/mod_file_cache.xml @@ -159,7 +159,9 @@ mod_rewrite.

Example + MMapFile /usr/local/apache/htdocs/index.html + @@ -188,7 +190,9 @@ mod_rewrite.

Example + CacheFile /usr/local/apache/htdocs/index.html + diff --git a/docs/manual/mod/mod_filter.xml b/docs/manual/mod/mod_filter.xml index 50d08c1e81..de1a723ef4 100644 --- a/docs/manual/mod/mod_filter.xml +++ b/docs/manual/mod/mod_filter.xml @@ -154,52 +154,50 @@
Server side Includes (SSI)
A simple case of replacing AddOutputFilterByType - - FilterDeclare SSI
- FilterProvider SSI INCLUDES "%{CONTENT_TYPE} =~ m|^text/html|"
- FilterChain SSI -
+ +FilterDeclare SSI +FilterProvider SSI INCLUDES "%{CONTENT_TYPE} =~ m|^text/html|" +FilterChain SSI +
Server side Includes (SSI)
The same as the above but dispatching on handler (classic SSI behaviour; .shtml files get processed). - - FilterProvider SSI INCLUDES "%{HANDLER} = 'server-parsed'"
- FilterChain SSI -
+ +FilterProvider SSI INCLUDES "%{HANDLER} = 'server-parsed'" +FilterChain SSI +
Emulating mod_gzip with mod_deflate
Insert INFLATE filter only if "gzip" is NOT in the Accept-Encoding header. This filter runs with ftype CONTENT_SET. - - FilterDeclare gzip CONTENT_SET
- FilterProvider gzip inflate "%{req:Accept-Encoding} !~ /gzip/"
- FilterChain gzip -
+ +FilterDeclare gzip CONTENT_SET +FilterProvider gzip inflate "%{req:Accept-Encoding} !~ /gzip/" +FilterChain gzip +
Image Downsampling
Suppose we want to downsample all web images, and have filters for GIF, JPEG and PNG. - - FilterProvider unpack jpeg_unpack "%{CONTENT_TYPE} = 'image/jpeg'"
- FilterProvider unpack gif_unpack "%{CONTENT_TYPE} = 'image/gif'"
- FilterProvider unpack png_unpack "%{CONTENT_TYPE} = 'image/png'"
-
- FilterProvider downsample downsample_filter "%{CONTENT_TYPE} = m|^image/(jpeg|gif|png)|"
- FilterProtocol downsample "change=yes"
-
- FilterProvider repack jpeg_pack "%{CONTENT_TYPE} = 'image/jpeg'"
- FilterProvider repack gif_pack "%{CONTENT_TYPE} = 'image/gif'"
- FilterProvider repack png_pack "%{CONTENT_TYPE} = 'image/png'"
- <Location /image-filter>
- - FilterChain unpack downsample repack
-
- </Location> -
+ +FilterProvider unpack jpeg_unpack "%{CONTENT_TYPE} = 'image/jpeg'" +FilterProvider unpack gif_unpack "%{CONTENT_TYPE} = 'image/gif'" +FilterProvider unpack png_unpack "%{CONTENT_TYPE} = 'image/png'" + +FilterProvider downsample downsample_filter "%{CONTENT_TYPE} = m|^image/(jpeg|gif|png)|" +FilterProtocol downsample "change=yes" + +FilterProvider repack jpeg_pack "%{CONTENT_TYPE} = 'image/jpeg'" +FilterProvider repack gif_pack "%{CONTENT_TYPE} = 'image/gif'" +FilterProvider repack png_pack "%{CONTENT_TYPE} = 'image/png'" +<Location /image-filter> + FilterChain unpack downsample repack +</Location> +
@@ -269,9 +267,9 @@ being moved to mod_filter in version 2.3.7 text/html or text/plain before it is sent to the client.

- + AddOutputFilterByType DEFLATE text/html text/plain - +

If you want the content to be processed by more than one filter, their names have to be separated by semicolons. It's also possible to use one @@ -283,14 +281,12 @@ being moved to mod_filter in version 2.3.7 INCLUDES filter and then by the DEFLATE filter.

- - <Location /cgi-bin/>
- - Options Includes
- AddOutputFilterByType INCLUDES;DEFLATE text/html
-
- </Location> -
+ +<Location /cgi-bin/> + Options Includes + AddOutputFilterByType INCLUDES;DEFLATE text/html +</Location> + diff --git a/docs/manual/mod/mod_firehose.xml b/docs/manual/mod/mod_firehose.xml index d120f6b17d..b1fcd6c3ab 100644 --- a/docs/manual/mod/mod_firehose.xml +++ b/docs/manual/mod/mod_firehose.xml @@ -158,7 +158,9 @@ later. present.

Example + FirehoseConnectionInput connection-input.firehose + @@ -180,7 +182,9 @@ later. keepalive is present.

Example + FirehoseConnectionOutput connection-output.firehose + @@ -201,7 +205,9 @@ later. will be captured separately, regardless of the presence of keepalive.

Example + FirehoseRequestInput request-input.firehose + @@ -222,7 +228,9 @@ later. will be captured separately, regardless of the presence of keepalive.

Example + FirehoseRequestOutput request-output.firehose + @@ -242,7 +250,9 @@ later.

Capture traffic being received by mod_proxy.

Example + FirehoseProxyConnectionInput proxy-input.firehose + @@ -262,7 +272,9 @@ later.

Capture traffic being sent out by mod_proxy.

Example + FirehoseProxyConnectionOutput proxy-output.firehose +