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/05/09 09:50:51 UTC
svn commit: r1335963 - in /httpd/httpd/branches/2.4.x/docs/manual/rewrite:
access.xml advanced.xml proxy.xml remapping.xml
Author: humbedooh
Date: Wed May 9 07:50:51 2012
New Revision: 1335963
URL: http://svn.apache.org/viewvc?rev=1335963&view=rev
Log:
backport whitespace/newline changes to 2.4
Modified:
httpd/httpd/branches/2.4.x/docs/manual/rewrite/access.xml
httpd/httpd/branches/2.4.x/docs/manual/rewrite/advanced.xml
httpd/httpd/branches/2.4.x/docs/manual/rewrite/proxy.xml
httpd/httpd/branches/2.4.x/docs/manual/rewrite/remapping.xml
Modified: httpd/httpd/branches/2.4.x/docs/manual/rewrite/access.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/rewrite/access.xml?rev=1335963&r1=1335962&r2=1335963&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/rewrite/access.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/rewrite/access.xml Wed May 9 07:50:51 2012
@@ -185,7 +185,10 @@ RewriteRule ^/secret/files/ - [F]
<highlight language="config">
SetEnvIfNoCase User-Agent ^NameOfBadRobot goaway
<Location /secret/files>
- Require not env goaway
+ <RequireAll>
+ Require all granted
+ Require not env goaway
+ </RequireAll>
</Location>
</highlight>
<p>
@@ -287,7 +290,7 @@ RewriteRule ^ ${deflector:%{HTTP_REFERER
we just wish to redirect back to where they came from, a "-" is
placed in the map:</p>
-<example>
+<highlight language="config">
##<br />
## deflector.map<br />
##<br />
@@ -295,7 +298,7 @@ RewriteRule ^ ${deflector:%{HTTP_REFERER
http://badguys.example.com/bad/index.html -<br />
http://badguys.example.com/bad/index2.html -<br />
http://badguys.example.com/bad/index3.html http://somewhere.example.com/
-</example>
+</highlight>
</dd>
</dl>
Modified: httpd/httpd/branches/2.4.x/docs/manual/rewrite/advanced.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/rewrite/advanced.xml?rev=1335963&r1=1335962&r2=1335963&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/rewrite/advanced.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/rewrite/advanced.xml Wed May 9 07:50:51 2012
@@ -94,10 +94,8 @@ http://physical_host_of_user1/u/user/any
<highlight language="config">
RewriteEngine on
-
RewriteMap users-to-hosts txt:/path/to/map.users-to-hosts
-
-RewriteRule ^/u/<strong>([^/]+)</strong>/?(.*) http://<strong>${users-to-hosts:$1|server0}</strong>/u/$1/$2
+RewriteRule ^/u/([^/]+)/?(.*) http://${users-to-hosts:$1|server0}/u/$1/$2
</highlight>
</dd>
</dl>
@@ -129,7 +127,7 @@ RewriteRule ^/u/<strong>([^/]+)</stron
<highlight language="config">
# This example is valid in per-directory context only
-RewriteCond %{REQUEST_URI} <strong>!-U</strong>
+RewriteCond %{REQUEST_URI} !-U
RewriteRule ^(.+)\.html$ /regenerate_page.cgi [PT,L]
</highlight>
@@ -172,7 +170,6 @@ RewriteRule ^(.+)\.html$ /regen
<highlight language="config">
RewriteEngine on
RewriteMap lb rnd:/path/to/serverlist.txt
-
RewriteRule ^/(.*) http://${lb:servers}/$1 [P,L]
</highlight>
Modified: httpd/httpd/branches/2.4.x/docs/manual/rewrite/proxy.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/rewrite/proxy.xml?rev=1335963&r1=1335962&r2=1335963&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/rewrite/proxy.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/rewrite/proxy.xml Wed May 9 07:50:51 2012
@@ -68,7 +68,7 @@ A number of recipes are provided that de
<highlight language="config">
RewriteEngine on
RewriteBase /products/
-RewriteRule ^<strong>widget/</strong>(.*)$ <strong>http://product.example.com/widget/</strong>$1 [<strong>P</strong>]
+RewriteRule ^widget/(.*)$ http://product.example.com/widget/$1 [P]
ProxyPassReverse /products/widget/ http://product.example.com/widget/
</highlight>
@@ -78,9 +78,9 @@ ProxyPassReverse /products/widget/ http:
has been migrated yet.</p>
<highlight language="config">
-RewriteCond %{REQUEST_FILENAME} <strong>!-f</strong>
-RewriteCond %{REQUEST_FILENAME} <strong>!-d</strong>
-RewriteRule ^/(.*) http://<strong>old</strong>.example.com/$1 [<strong>P</strong>]
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule ^/(.*) http://old.example.com/$1 [P]
ProxyPassReverse / http://old.example.com/
</highlight>
</dd>
Modified: httpd/httpd/branches/2.4.x/docs/manual/rewrite/remapping.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/rewrite/remapping.xml?rev=1335963&r1=1335962&r2=1335963&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/rewrite/remapping.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/rewrite/remapping.xml Wed May 9 07:50:51 2012
@@ -187,7 +187,7 @@ Redirect /docs/ http://new.example.com/d
<highlight language="config">
RewriteEngine on
RewriteBase /~quux/
-RewriteRule ^foo\.<strong>html</strong>$ foo.<strong>cgi</strong> [H=<strong>cgi-script</strong>]
+RewriteRule ^foo\.html$ foo.cgi [H=<strong>cgi-script</strong>]
</highlight>
</dd>
</dl>
@@ -476,8 +476,8 @@ com http://www.example.com/<br />
RewriteCond %{HTTP_USER_AGENT} ^<strong>Mozilla/3</strong>.*
RewriteRule ^foo\.html$ foo.<strong>NS</strong>.html [<strong>L</strong>]
-RewriteCond %{HTTP_USER_AGENT} ^<strong>Lynx/</strong> [OR]
-RewriteCond %{HTTP_USER_AGENT} ^<strong>Mozilla/[12]</strong>
+RewriteCond %{HTTP_USER_AGENT} ^Lynx/ [OR]
+RewriteCond %{HTTP_USER_AGENT} ^Mozilla/[12]
RewriteRule ^foo\.html$ foo.<strong>20</strong>.html [<strong>L</strong>]
RewriteRule ^foo\.html$ foo.<strong>32</strong>.html [<strong>L</strong>]
@@ -551,7 +551,7 @@ using the following ruleset:</p>
<highlight language="config">
RewriteEngine on
-RewriteRule <strong>^/$</strong> /about/ [<strong>R</strong>]
+RewriteRule ^/$ /about/ [<strong>R</strong>]
</highlight>
<p>Note that this can also be handled using the <directive