httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From humbed...@apache.org
Subject svn commit: r1332585 - in /httpd/httpd/trunk/docs/manual/rewrite: advanced.html.en advanced.xml flags.html.en flags.xml
Date Tue, 01 May 2012 09:21:13 GMT
Author: humbedooh
Date: Tue May  1 09:21:13 2012
New Revision: 1332585

URL: http://svn.apache.org/viewvc?rev=1332585&view=rev
Log:
Fix whitespace issues and anchor patterns when needed in flags.xml
Fix double-escaped characters in advanced.xml

Modified:
    httpd/httpd/trunk/docs/manual/rewrite/advanced.html.en
    httpd/httpd/trunk/docs/manual/rewrite/advanced.xml
    httpd/httpd/trunk/docs/manual/rewrite/flags.html.en
    httpd/httpd/trunk/docs/manual/rewrite/flags.xml

Modified: httpd/httpd/trunk/docs/manual/rewrite/advanced.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/advanced.html.en?rev=1332585&r1=1332584&r2=1332585&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/advanced.html.en (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/advanced.html.en Tue May  1 09:21:13 2012
@@ -269,13 +269,13 @@ $QS_n = 3600 if ($QS_n eq '');
 if ($QS_f eq '') {
 print "HTTP/1.0 200 OK\n";
 print "Content-type: text/html\n\n";
-print "<b>ERROR</b>: No file given\n";
+print "<b>ERROR</b>: No file given\n";
 exit(0);
 }
 if (! -f $QS_f) {
 print "HTTP/1.0 200 OK\n";
 print "Content-type: text/html\n\n";
-print "<b>ERROR</b>: File $QS_f not found\n";
+print "<b>ERROR</b>: File $QS_f not found\n";
 exit(0);
 }
 
@@ -307,7 +307,7 @@ local($file) = @_;
 local(*FP, $size, $buffer, $bytes);
 ($x, $x, $x, $x, $x, $x, $x, $size) = stat($file);
 $size = sprintf("%d", $size);
-open(FP, "<$file");
+open(FP, "<$file");
 $bytes = sysread(FP, $buffer, $size);
 close(FP);
 return $buffer;

Modified: httpd/httpd/trunk/docs/manual/rewrite/advanced.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/advanced.xml?rev=1332585&r1=1332584&r2=1332585&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/advanced.xml (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/advanced.xml Tue May  1 09:21:13 2012
@@ -272,13 +272,13 @@ $QS_n = 3600 if ($QS_n eq '');
 if ($QS_f eq '') {
 print "HTTP/1.0 200 OK\n";
 print "Content-type: text/html\n\n";
-print "<b>ERROR</b>: No file given\n";
+print "<b>ERROR</b>: No file given\n";
 exit(0);
 }
 if (! -f $QS_f) {
 print "HTTP/1.0 200 OK\n";
 print "Content-type: text/html\n\n";
-print "<b>ERROR</b>: File $QS_f not found\n";
+print "<b>ERROR</b>: File $QS_f not found\n";
 exit(0);
 }
 
@@ -310,7 +310,7 @@ local($file) = @_;
 local(*FP, $size, $buffer, $bytes);
 ($x, $x, $x, $x, $x, $x, $x, $size) = stat($file);
 $size = sprintf("%d", $size);
-open(FP, "<$file");
+open(FP, "<$file");
 $bytes = sysread(FP, $buffer, $size);
 close(FP);
 return $buffer;

Modified: httpd/httpd/trunk/docs/manual/rewrite/flags.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/flags.html.en?rev=1332585&r1=1332584&r2=1332585&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/flags.html.en (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/flags.html.en Tue May  1 09:21:13 2012
@@ -265,7 +265,7 @@ environment variable is used to exclude 
 log.</p>
 
 <pre class="prettyprint lang-config">
-RewriteRule \.(png|gif|jpg) - [E=image:1]
+RewriteRule \.(png|gif|jpg)$ - [E=image:1]
 CustomLog logs/access_log combined env=!image
 </pre>
 
@@ -481,7 +481,7 @@ requests.
 example, if you wanted all image requests to be handled by a back-end
 image server, you might do something like the following:</p>
 
-<pre class="prettyprint lang-config">RewriteRule /(.*)\.(jpg|gif|png) http://images.example.com/$1.$2
[P]</pre>
+<pre class="prettyprint lang-config">RewriteRule /(.*)\.(jpg|gif|png)$ http://images.example.com/$1.$2
[P]</pre>
 
 
 <p>Use of the [P] flag implies [L] - that is, the request is immediately
@@ -531,7 +531,7 @@ use the [PT] flag to ensure that the
 
 <pre class="prettyprint lang-config">
 Alias /icons /usr/local/apache/icons
-RewriteRule /pics/(.+)\.jpg /icons/$1.gif [PT]
+RewriteRule /pics/(.+)\.jpg$ /icons/$1.gif [PT]
 </pre>
 
 
@@ -666,12 +666,12 @@ RewriteCond %{REQUEST_FILENAME} !-d
 RewriteRule .? - [S=3]
 
 # IF the file exists, then:
-	RewriteRule (.*\.gif) images.php?$1
-	RewriteRule (.*\.html) docs.php?$1
-	# Skip past the "else" stanza.
-	RewriteRule .? - [S=1]
+    RewriteRule (.*\.gif) images.php?$1
+    RewriteRule (.*\.html) docs.php?$1
+    # Skip past the "else" stanza.
+    RewriteRule .? - [S=1]
 # ELSE...
-	RewriteRule (.*) 404.php?file=$1
+    RewriteRule (.*) 404.php?file=$1
 # END
 </pre>
 

Modified: httpd/httpd/trunk/docs/manual/rewrite/flags.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/flags.xml?rev=1332585&r1=1332584&r2=1332585&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/flags.xml (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/flags.xml Tue May  1 09:21:13 2012
@@ -252,7 +252,7 @@ environment variable is used to exclude 
 log.</p>
 
 <highlight language="config">
-RewriteRule \.(png|gif|jpg) - [E=image:1]
+RewriteRule \.(png|gif|jpg)$ - [E=image:1]
 CustomLog logs/access_log combined env=!image
 </highlight>
 
@@ -465,7 +465,7 @@ requests.
 example, if you wanted all image requests to be handled by a back-end
 image server, you might do something like the following:</p>
 
-<highlight language="config">RewriteRule /(.*)\.(jpg|gif|png) http://images.example.com/$1.$2
[P]</highlight>
+<highlight language="config">RewriteRule /(.*)\.(jpg|gif|png)$ http://images.example.com/$1.$2
[P]</highlight>
 
 <p>Use of the [P] flag implies [L] - that is, the request is immediately
 pushed through the proxy, and any following rules will not be
@@ -520,7 +520,7 @@ use the [PT] flag to ensure that the
 
 <highlight language="config">
 Alias /icons /usr/local/apache/icons
-RewriteRule /pics/(.+)\.jpg /icons/$1.gif [PT]
+RewriteRule /pics/(.+)\.jpg$ /icons/$1.gif [PT]
 </highlight>
 
 <p>
@@ -654,12 +654,12 @@ RewriteCond %{REQUEST_FILENAME} !-d
 RewriteRule .? - [S=3]
 
 # IF the file exists, then:
-	RewriteRule (.*\.gif) images.php?$1
-	RewriteRule (.*\.html) docs.php?$1
-	# Skip past the &quot;else&quot; stanza.
-	RewriteRule .? - [S=1]
+    RewriteRule (.*\.gif) images.php?$1
+    RewriteRule (.*\.html) docs.php?$1
+    # Skip past the &quot;else&quot; stanza.
+    RewriteRule .? - [S=1]
 # ELSE...
-	RewriteRule (.*) 404.php?file=$1
+    RewriteRule (.*) 404.php?file=$1
 # END
 </highlight>
 



Mime
View raw message