httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From no...@apache.org
Subject svn commit: r559019 - in /httpd/httpd/branches/2.2.x/docs/manual/mod: mod_rewrite.html.en mod_rewrite.xml
Date Tue, 24 Jul 2007 12:15:23 GMT
Author: noodl
Date: Tue Jul 24 05:15:22 2007
New Revision: 559019

URL: http://svn.apache.org/viewvc?view=rev&rev=559019
Log:
Merge r558837 (Address PR42898 by qualifying the value of Pattern for RewriteRule, and later
explaining how to snarf the rest of the request url.)

Modified:
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.html.en
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.xml

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.html.en?view=diff&rev=559019&r1=559018&r2=559019
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.html.en Tue Jul 24 05:15:22 2007
@@ -1043,11 +1043,10 @@
 
       <p><a id="patterns" name="patterns"><em>Pattern</em></a>
is
       a perl compatible <a id="regexp" name="regexp">regular
-      expression</a>, which is applied to the current URL.
-      ``Current'' means the value of the URL when this rule is
-      applied. This may not be the originally requested URL,
-      which may already have matched a previous rule, and have been
-      altered.</p>
+      expression</a>. On the first RewriteRule it is applied to the
+      <a href="./directive-dict.html#Syntax">URL-path</a> of the request;
+      subsequent patterns are applied to the output of the last matched
+      RewriteRule.</p>
 
       <p>Some hints on the syntax of <a class="glossarylink" href="../glossary.html#regex"
title="see glossary">regular 
       expressions</a>:</p>
@@ -1455,13 +1454,16 @@
           <strong>R</strong>-flag.</p>
 </div>
 
-<div class="note"><h3>Note: Query String</h3>
-      <p>The <em>Pattern</em> will not be matched against the query string.
-      To do this, you must use a <code class="directive"><a href="#rewritecond">RewriteCond</a></code>
with the
-      <code>%{QUERY_STRING}</code> variable. You can, however, create
-      URLs in the substitution string, containing a query string
-      part. Simply use a question mark inside the substitution string, to
-      indicate that the following text should be re-injected into the
+<div class="note"><h3>What is matched?</h3>
+      <p>The <em>Pattern</em> will initially be matched against the part
of the
+      URL after the hostname and port, and before the query string. If you wish
+      to match against the hostname, port, or query string, use a
+      <code class="directive"><a href="#rewritecond">RewriteCond</a></code>
with the
+      <code>%{HTTP_HOST}</code>, <code>%{SERVER_PORT}</code>, or
+      <code>%{QUERY_STRING}</code> variables respectively.</p>
+      <p>You can, however, create URLs in the substitution string containing a
+      query string part. Simply use a question mark inside the substitution
+      string, to indicate that the following text should be re-injected into the
       query string. When you want to erase an existing query string,
       end the substitution string with just a question mark. To
       combine new and old query strings, use the

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.xml?view=diff&rev=559019&r1=559018&r2=559019
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.xml Tue Jul 24 05:15:22 2007
@@ -1056,11 +1056,10 @@
 
       <p><a id="patterns" name="patterns"><em>Pattern</em></a>
is
       a perl compatible <a id="regexp" name="regexp">regular
-      expression</a>, which is applied to the current URL.
-      ``Current'' means the value of the URL when this rule is
-      applied. This may not be the originally requested URL,
-      which may already have matched a previous rule, and have been
-      altered.</p>
+      expression</a>. On the first RewriteRule it is applied to the
+      <a href="./directive-dict.html#Syntax">URL-path</a> of the request;
+      subsequent patterns are applied to the output of the last matched
+      RewriteRule.</p>
 
       <p>Some hints on the syntax of <glossary ref="regex">regular 
       expressions</glossary>:</p>
@@ -1478,14 +1477,16 @@
           <strong>R</strong>-flag.</p>
 </note>
 
-<note><title>Note: Query String</title>
-      <p>The <em>Pattern</em> will not be matched against the query string.
-      To do this, you must use a <directive
-      module="mod_rewrite">RewriteCond</directive> with the
-      <code>%{QUERY_STRING}</code> variable. You can, however, create
-      URLs in the substitution string, containing a query string
-      part. Simply use a question mark inside the substitution string, to
-      indicate that the following text should be re-injected into the
+<note><title>What is matched?</title>
+      <p>The <em>Pattern</em> will initially be matched against the part
of the
+      URL after the hostname and port, and before the query string. If you wish
+      to match against the hostname, port, or query string, use a
+      <directive module="mod_rewrite">RewriteCond</directive> with the
+      <code>%{HTTP_HOST}</code>, <code>%{SERVER_PORT}</code>, or
+      <code>%{QUERY_STRING}</code> variables respectively.</p>
+      <p>You can, however, create URLs in the substitution string containing a
+      query string part. Simply use a question mark inside the substitution
+      string, to indicate that the following text should be re-injected into the
       query string. When you want to erase an existing query string,
       end the substitution string with just a question mark. To
       combine new and old query strings, use the



Mime
View raw message