You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by hu...@apache.org on 2012/04/27 07:17:58 UTC
svn commit: r1331219 - in /httpd/httpd/trunk/docs/manual/mod:
mod_ratelimit.xml mod_reflector.xml mod_remoteip.xml mod_reqtimeout.xml
mod_rewrite.xml
Author: humbedooh
Date: Fri Apr 27 05:17:57 2012
New Revision: 1331219
URL: http://svn.apache.org/viewvc?rev=1331219&view=rev
Log:
Syntax updates for mod_r*.xml
Modified:
httpd/httpd/trunk/docs/manual/mod/mod_ratelimit.xml
httpd/httpd/trunk/docs/manual/mod/mod_reflector.xml
httpd/httpd/trunk/docs/manual/mod/mod_remoteip.xml
httpd/httpd/trunk/docs/manual/mod/mod_reqtimeout.xml
httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml
Modified: httpd/httpd/trunk/docs/manual/mod/mod_ratelimit.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_ratelimit.xml?rev=1331219&r1=1331218&r2=1331219&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ratelimit.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ratelimit.xml Fri Apr 27 05:17:57 2012
@@ -38,12 +38,12 @@ The connection speed to be simulated is
variable <code>rate-limit</code>.</p>
<example><title>Example Configuration</title>
-<Location /downloads><br />
-<indent>
-SetOutputFilter RATE_LIMIT<br />
-SetEnv rate-limit 400 <br />
-</indent>
+<highlight language="config">
+<Location /downloads>
+ SetOutputFilter RATE_LIMIT
+ SetEnv rate-limit 400
</Location>
+</highlight>
</example>
</summary>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_reflector.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_reflector.xml?rev=1331219&r1=1331218&r2=1331219&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_reflector.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_reflector.xml Fri Apr 27 05:17:57 2012
@@ -43,23 +43,23 @@
<dd>Pass the request body through the DEFLATE filter to compress the
body. This request requires a Content-Encoding request header containing
"gzip" for the filter to return compressed data.
- <example>
- <Location /compress><br/>
- SetHandler reflector<br/>
- SetOutputFilter DEFLATE<br/>
- </Location>
- </example>
+ <highlight language="config">
+<Location /compress>
+ SetHandler reflector
+ SetOutputFilter DEFLATE
+</Location>
+ </highlight>
</dd>
<dt>Image downsampling service</dt>
<dd>Pass the request body through an image downsampling filter, and reflect
the results to the caller.
- <example>
- <Location /downsample><br/>
- SetHandler reflector<br/>
- SetOutputFilter DOWNSAMPLE<br/>
- </Location>
- </example>
+ <highlight language="config">
+<Location /downsample>
+ SetHandler reflector
+ SetOutputFilter DOWNSAMPLE
+</Location>
+ </highlight>
</dd>
</dl>
</section>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_remoteip.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_remoteip.xml?rev=1331219&r1=1331218&r2=1331219&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_remoteip.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_remoteip.xml Fri Apr 27 05:17:57 2012
@@ -118,11 +118,15 @@ via the request headers.
hosts presenting a <directive>RemoteIPHeader</directive> IP value.</p>
<example><title>Internal (Load Balancer) Example</title>
+ <highlight language="config">
RemoteIPHeader X-Client-IP
+ </highlight>
</example>
<example><title>Proxy Example</title>
+ <highlight language="config">
RemoteIPHeader X-Forwarded-For
+ </highlight>
</example>
</usage>
</directivesynopsis>
@@ -142,9 +146,11 @@ via the request headers.
trusted when passed from these proxies.</p>
<example><title>Internal (Load Balancer) Example</title>
- RemoteIPHeader X-Client-IP<br/>
- RemoteIPTrustedProxy 10.0.2.0/24<br/>
- RemoteIPTrustedProxy gateway.localdomain
+ <highlight language="config">
+RemoteIPHeader X-Client-IP
+RemoteIPTrustedProxy 10.0.2.0/24
+RemoteIPTrustedProxy gateway.localdomain
+ </highlight>
</example>
</usage>
</directivesynopsis>
@@ -170,9 +176,11 @@ via the request headers.
</example>
<example><title>conf/trusted-proxies.lst contents</title>
- # Our internally trusted proxies;<br/>
- 10.0.2.0/24 #Everyone in the testing group<br/>
- gateway.localdomain #The front end balancer
+ <example><pre>
+# Our internally trusted proxies;
+10.0.2.0/24 #Everyone in the testing group
+gateway.localdomain #The front end balancer
+ </pre></example>
</example>
</usage>
</directivesynopsis>
@@ -193,8 +201,10 @@ via the request headers.
<directive>RemoteIPInternalProxy</directive> addresses are discarded.</p>
<example><title>Example</title>
- RemoteIPHeader X-Forwarded-For<br/>
- RemoteIPProxiesHeader X-Forwarded-By
+ <highlight language="config">
+RemoteIPHeader X-Forwarded-For
+RemoteIPProxiesHeader X-Forwarded-By
+ </highlight>
</example>
</usage>
</directivesynopsis>
@@ -216,9 +226,11 @@ via the request headers.
<directive>RemoteIPHeader</directive> header's value.</p>
<example><title>Trusted (Load Balancer) Example</title>
- RemoteIPHeader X-Forwarded-For<br/>
- RemoteIPTrustedProxy 10.0.2.16/28<br/>
- RemoteIPTrustedProxy proxy.example.com
+ <highlight language="config">
+RemoteIPHeader X-Forwarded-For
+RemoteIPTrustedProxy 10.0.2.16/28
+RemoteIPTrustedProxy proxy.example.com
+ </highlight>
</example>
</usage>
</directivesynopsis>
@@ -239,8 +251,10 @@ via the request headers.
the <directive>RemoteIPTrustedProxy</directive> directive.</p>
<example><title>Trusted (Load Balancer) Example</title>
- RemoteIPHeader X-Forwarded-For<br/>
- RemoteIPTrustedProxyList conf/trusted-proxies.lst
+ <highlight language="config">
+RemoteIPHeader X-Forwarded-For
+RemoteIPTrustedProxyList conf/trusted-proxies.lst
+ </highlight>
</example>
<example><title>conf/trusted-proxies.lst contents</title>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_reqtimeout.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_reqtimeout.xml?rev=1331219&r1=1331218&r2=1331219&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_reqtimeout.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_reqtimeout.xml Fri Apr 27 05:17:57 2012
@@ -37,9 +37,9 @@
Allow 10 seconds to receive the request including the headers and
30 seconds for receiving the request body:
- <example>
+ <highlight language="config">
RequestReadTimeout header=10 body=30
- </example>
+ </highlight>
</li>
<li>
@@ -49,9 +49,9 @@
the limit given indirectly by
<directive module="core">LimitRequestBody</directive>):
- <example>
+ <highlight language="config">
RequestReadTimeout body=10,MinRate=1000
- </example>
+ </highlight>
</li>
<li>
@@ -60,9 +60,9 @@
500 bytes received. But do not allow more than 30 seconds for the
request including the headers:
- <example>
+ <highlight language="config">
RequestReadTimeout header=10-30,MinRate=500
- </example>
+ </highlight>
</li>
<li>
@@ -70,9 +70,9 @@
If a common configuration is used for http and https virtual hosts, the
timeouts should not be set too low:
- <example>
+ <highlight language="config">
RequestReadTimeout header=20-40,MinRate=500 body=20,MinRate=500
- </example>
+ </highlight>
</li>
</ol>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml?rev=1331219&r1=1331218&r2=1331219&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml Fri Apr 27 05:17:57 2012
@@ -69,7 +69,9 @@ URLs on the fly</description>
</note>
<example><title>Example</title>
+ <highlight language="config">
LogLevel alert rewrite:trace3
+ </highlight>
</example>
<note><title>RewriteLog</title>
@@ -234,16 +236,16 @@ Apache HTTP Server 2.0.41 and later</com
<p>For example, you might define a
<directive>RewriteMap</directive> as:</p>
- <example>
+ <highlight language="config">
RewriteMap examplemap txt:/path/to/file/map.txt
- </example>
+ </highlight>
<p>You would then be able to use this map in a
<directive>RewriteRule</directive> as follows:</p>
- <example>
+ <highlight language="config">
RewriteRule ^/ex/(.*) ${examplemap:$1}
- </example>
+ </highlight>
<p>The following combinations for <em>MapType</em> and
<em>MapSource</em> can be used:</p>
@@ -316,17 +318,15 @@ Apache HTTP Server 2.0.41 and later</com
since the resource was not relative to the document root. This
misconfiguration would normally cause the server to look for an "opt"
directory under the document root.</p>
-<example>
-<pre>
+<highlight language="config">
DocumentRoot /var/www/example.com
Alias /myapp /opt/myapp-1.2.3
<Directory /opt/myapp-1.2.3>
-RewriteEngine On
-RewriteBase /myapp/
-RewriteRule ^index\.html$ welcome.html
+ RewriteEngine On
+ RewriteBase /myapp/
+ RewriteRule ^index\.html$ welcome.html
</Directory>
-</pre>
-</example>
+</highlight>
</usage>
</directivesynopsis>
@@ -803,10 +803,10 @@ RewriteRule ^index\.html$ welcome.html
to block unwanted hotlinking.
</p>
- <example>
+ <highlight language="config">
RewriteCond expr "! %{HTTP_REFERER} -strmatch '*://%{HTTP_HOST}/*'"<br />
RewriteRule ^/images - [F]
- </example>
+ </highlight>
</li>
<li>You can also set special flags for
@@ -832,14 +832,12 @@ RewriteRule ^index\.html$ welcome.html
Use this to combine rule conditions with a local OR
instead of the implicit AND. Typical example:
-<example>
-<pre>
+<highlight language="config">
RewriteCond %{REMOTE_HOST} ^host1 [OR]
RewriteCond %{REMOTE_HOST} ^host2 [OR]
RewriteCond %{REMOTE_HOST} ^host3
RewriteRule ...some special stuff for any of these hosts...
-</pre>
-</example>
+</highlight>
Without this flag you would have to write the condition/rule
pair three times.
@@ -864,8 +862,7 @@ RewriteRule ...some special stuff for an
``<code>User-Agent:</code>'' header of the request, you can
use the following: </p>
-<example>
-<pre>
+<highlight language="config">
RewriteCond %{HTTP_USER_AGENT} ^Mozilla
RewriteRule ^/$ /homepage.max.html [L]
@@ -873,8 +870,7 @@ RewriteCond %{HTTP_USER_AGENT} ^Lynx
RewriteRule ^/$ /homepage.min.html [L]
RewriteRule ^/$ /homepage.std.html [L]
-</pre>
-</example>
+</highlight>
<p>Explanation: If you use a browser which identifies itself
as 'Mozilla' (including Netscape Navigator, Mozilla etc), then you