You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rp...@apache.org on 2019/11/13 13:23:52 UTC
svn commit: r1869738 [10/10] - in /httpd/httpd/trunk/docs: man/ manual/misc/
manual/mod/ manual/programs/ manual/rewrite/
Modified: httpd/httpd/trunk/docs/manual/programs/httxt2dbm.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/programs/httxt2dbm.html.en?rev=1869738&r1=1869737&r2=1869738&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/httxt2dbm.html.en (original)
+++ httpd/httpd/trunk/docs/manual/programs/httxt2dbm.html.en Wed Nov 13 13:23:50 2019
@@ -66,7 +66,7 @@
</dd>
<dt><code>-i <var>SOURCE_TXT</var></code></dt>
- <dd>Input file from which the dbm is to be created. The file should be formated
+ <dd>Input file from which the dbm is to be created. The file should be formatted
with one record per line, of the form: <code>key value</code>.
See the documentation for <code class="directive"><a href="../mod/mod_rewrite.html#rewritemap">RewriteMap</a></code> for
further details of this file's format and meaning.
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=1869738&r1=1869737&r2=1869738&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/advanced.html.en (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/advanced.html.en Wed Nov 13 13:23:50 2019
@@ -308,10 +308,10 @@ RewriteRule "^foo\.html$"
<dt>Description:</dt>
<dd>
- <p>At time, we want to maintain some kind of status when we
+ <p>At times, we want to maintain some kind of status when we
perform a rewrite. For example, you want to make a note that
you've done that rewrite, so that you can check later to see if a
- request can via that rewrite. One way to do this is by setting an
+ request came via that rewrite. One way to do this is by setting an
environment variable.</p>
</dd>
@@ -332,7 +332,10 @@ RewriteRule "^/horse/(.*)" "/pony/$1
<p>Note that environment variables do not survive an external
redirect. You might consider using the [CO] flag to set a
- cookie.</p>
+ cookie. For per-directory and htaccess rewrites, where the final
+ substitution is processed as an internal redirect, environment
+ variables from the previous round of rewriting are prefixed with
+ "REDIRECT_". </p>
</dd>
</dl>
Modified: httpd/httpd/trunk/docs/manual/rewrite/intro.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/intro.html.en?rev=1869738&r1=1869737&r2=1869738&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/intro.html.en (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/intro.html.en Wed Nov 13 13:23:50 2019
@@ -73,7 +73,7 @@ it will tell you exactly how each rule i
<div class="section">
<h2><a name="regex" id="regex">Regular Expressions</a> <a title="Permanent link" href="#regex" class="permalink">¶</a></h2>
-<p>mod_rewrite uses the <a href="http://pcre.org/">Perl Compatible
+<p><code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> uses the <a href="http://pcre.org/">Perl Compatible
Regular Expression</a> vocabulary. In this document, we do not attempt
to provide a detailed reference to regular expressions. For that, we
recommend the <a href="http://pcre.org/pcre.txt">PCRE man pages</a>, the
@@ -101,32 +101,65 @@ well as write your own.</p>
<th>Example</th>
</tr>
-<tr><td><code>.</code></td><td>Matches any single
-character</td><td><code>c.t</code> will match <code>cat</code>,
-<code>cot</code>, <code>cut</code>, etc.</td></tr>
-<tr><td><code>+</code></td><td>Repeats the previous match one or more
-times</td><td><code>a+</code> matches <code>a</code>, <code>aa</code>,
-<code>aaa</code>, etc</td></tr>
-<tr><td><code>*</code></td><td>Repeats the previous match zero or more
-times.</td><td><code>a*</code> matches all the same things
-<code>a+</code> matches, but will also match an empty string.</td></tr>
-<tr><td><code>?</code></td><td>Makes the match optional.</td><td>
-<code>colou?r</code> will match <code>color</code> and <code>colour</code>.</td>
-</tr>
-<tr><td><code>^</code></td><td>Called an anchor, matches the beginning
-of the string</td><td><code>^a</code> matches a string that begins with
-<code>a</code></td></tr>
-<tr><td><code>$</code></td><td>The other anchor, this matches the end of
-the string.</td><td><code>a$</code> matches a string that ends with
-<code>a</code>.</td></tr>
-<tr><td><code>( )</code></td><td>Groups several characters into a single
-unit, and captures a match for use in a backreference.</td><td><code>(ab)+</code>
-matches <code>ababab</code> - that is, the <code>+</code> applies to the group.
-For more on backreferences see <a href="#InternalBackRefs">below</a>.</td></tr>
-<tr><td><code>[ ]</code></td><td>A character class - matches one of the
-characters</td><td><code>c[uoa]t</code> matches <code>cut</code>,
-<code>cot</code> or <code>cat</code>.</td></tr>
-<tr><td><code>[^ ]</code></td><td>Negative character class - matches any character not specified</td><td><code>c[^/]t</code> matches <code>cat</code> or <code>c=t</code> but not <code>c/t</code></td></tr>
+<tr>
+ <td><code>.</code></td>
+ <td>Matches any single character</td>
+ <td><code>c.t</code> will match <code>cat</code>, <code>cot</code>,
+ <code>cut</code>, etc</td>
+</tr>
+<tr>
+ <td><code>+</code></td>
+ <td>Repeats the previous match one or more times</td>
+ <td><code>a+</code> matches <code>a</code>, <code>aa</code>,
+ <code>aaa</code>, etc</td>
+</tr>
+<tr>
+ <td><code>*</code></td>
+ <td>Repeats the previous match zero or more times</td>
+ <td><code>a*</code> matches all the same things <code>a+</code> matches,
+ but will also match an empty string</td>
+</tr>
+<tr>
+ <td><code>?</code></td>
+ <td>Makes the match optional</td>
+ <td><code>colou?r</code> will match <code>color</code> and
+ <code>colour</code></td>
+</tr>
+<tr>
+ <td><code>\</code></td>
+ <td>Escape the next character</td>
+ <td><code>\.</code> will match <code>.</code> (dot) and not <em>any single
+ character</em> as explain above</td>
+</tr>
+<tr>
+ <td><code>^</code></td>
+ <td>Called an anchor, matches the beginning of the string</td>
+ <td><code>^a</code> matches a string that begins with <code>a</code></td>
+</tr>
+<tr>
+ <td><code>$</code></td>
+ <td>The other anchor, this matches the end of the string</td>
+ <td><code>a$</code> matches a string that ends with <code>a</code></td>
+</tr>
+<tr>
+ <td><code>( )</code></td>
+ <td>Groups several characters into a single unit, and captures a match
+ for use in a backreference</td>
+ <td><code>(ab)+</code> matches <code>ababab</code> - that is, the
+ <code>+</code> applies to the group. For more on backreferences see
+ <a href="#InternalBackRefs">below</a></td>
+</tr>
+<tr>
+ <td><code>[ ]</code></td>
+ <td>A character class - matches one of the characters</td>
+ <td><code>c[uoa]t</code> matches <code>cut</code>, <code>cot</code> or
+ <code>cat</code></td>
+</tr>
+<tr>
+ <td><code>[^ ]</code></td>
+ <td>Negative character class - matches any character not specified</td>
+ <td><code>c[^/]t</code> matches <code>cat</code> or <code>c=t</code> but
+ not <code>c/t</code></td></tr>
</table>
<p>In <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> the <code>!</code> character can be