From: Daniel Earl Poirier <poirier@apache.org>
Date: Mon, 14 Dec 2009 18:52:03 +0000 (+0000)
Subject: Update transforms.
X-Git-Tag: 2.3.5~86
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2d3400d1c46388e3ee0c1fb9cb9511429c0eb209;p=thirdparty%2Fapache%2Fhttpd.git

Update transforms.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@890437 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/glossary.html.en b/docs/manual/glossary.html.en
index 8e39c2ea5ee..7fe55e3b9b8 100644
--- a/docs/manual/glossary.html.en
+++ b/docs/manual/glossary.html.en
@@ -363,7 +363,9 @@
       attributes against collections of files or resources in very flexible ways
       - for example, all .gif and .jpg files under any "images" directory could
       be written as "<code>/images/.*(jpg|gif)$</code>".  Apache uses Perl
-      Compatible Regular Expressions provided by the <a href="http://www.pcre.org/">PCRE</a> library.
+      Compatible Regular Expressions provided by the <a href="http://www.pcre.org/">PCRE</a> library.  You can find more documentation
+      about PCRE's regular expression syntax at that site, or at
+      <a href="http://en.wikipedia.org/wiki/PCRE">Wikipedia</a>.
     </dd>
 
     <dt><a name="reverseproxy" id="reverseproxy">Reverse Proxy</a></dt>
diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index 74ee27174fe..e9b300e4fe8 100644
--- a/docs/manual/mod/core.xml.de
+++ b/docs/manual/mod/core.xml.de
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 167959:886154 (outdated) -->
+<!-- English Revision: 167959:890378 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index b61f23924f5..0ed19d4f4cc 100644
--- a/docs/manual/mod/core.xml.ja
+++ b/docs/manual/mod/core.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 669847:886154 (outdated) -->
+<!-- English Revision: 669847:890378 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.xml.tr b/docs/manual/mod/core.xml.tr
index c3c8bd0de63..940e233ba1c 100644
--- a/docs/manual/mod/core.xml.tr
+++ b/docs/manual/mod/core.xml.tr
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 813376:886154 (outdated) -->
+<!-- English Revision: 813376:890378 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/mod/mod_alias.html.en b/docs/manual/mod/mod_alias.html.en
index 7ee33b48161..70ed7d531e8 100644
--- a/docs/manual/mod/mod_alias.html.en
+++ b/docs/manual/mod/mod_alias.html.en
@@ -190,13 +190,65 @@ expressions</td></tr>
       AliasMatch ^/icons(.*) /usr/local/apache/icons$1
     </code></p></div>
 
-    <p>It is also possible to construct an alias with case-insensitive
+    <p>The full range of <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular expression</a>
+    power is available.  For example,
+    it is possible to construct an alias with case-insensitive
     matching of the url-path:</p>
 
     <div class="example"><p><code>
       AliasMatch (?i)^/image(.*) /ftp/pub/image$1
     </code></p></div>
 
+    <p>One subtle difference
+    between <code class="directive"><a href="#alias">Alias</a></code>
+    and <code class="directive"><a href="#aliasmatch">AliasMatch</a></code> is
+    that <code class="directive"><a href="#alias">Alias</a></code> will
+    automatically copy any additional part of the URI, past the part
+    that matched, onto the end of the file path on the right side,
+    while <code class="directive"><a href="#aliasmatch">AliasMatch</a></code> will
+    not.  This means that in almost all cases, you will want the
+    regular expression to match the entire request URI from beginning
+    to end, and to use substitution on the right side.</p>
+
+    <p>In other words, just changing 
+    <code class="directive"><a href="#alias">Alias</a></code> to
+    <code class="directive"><a href="#aliasmatch">AliasMatch</a></code> will not
+    have the same effect.  At a minimum, you need to
+    add <code>^</code> to the beginning of the regular expression
+    and add <code>(.*)$</code> to the end, and add <code>$1</code> to
+    the end of the replacement.</p>
+
+    <p>For example, suppose you want to replace this with AliasMatch:</p>
+
+    <div class="example"><p><code>
+      Alias /image/ /ftp/pub/image/
+    </code></p></div>
+
+    <p>This is NOT equivalent - don't do this!  This will send all
+    requests that have /image/ anywhere in them to /ftp/pub/image/:</p>
+
+    <div class="example"><p><code>
+      AliasMatch /image/ /ftp/pub/image/
+    </code></p></div>
+
+    <p>This is what you need to get the same effect:</p>
+
+    <div class="example"><p><code>
+      AliasMatch ^/image/(.*)$ /ftp/pub/image/$1
+    </code></p></div>
+
+    <p>Of course, there's no point in
+    using <code class="directive"><a href="#aliasmatch">AliasMatch</a></code>
+    where <code class="directive"><a href="#alias">Alias</a></code> would
+    work.  <code class="directive"><a href="#aliasmatch">AliasMatch</a></code> lets
+    you do more complicated things.  For example, you could
+    serve different kinds of files from different directories:</p>
+
+    <div class="example"><p><code>
+      AliasMatch ^/image/(.*)\.jpg$ /files/jpg.images/$1.jpg<br />
+      AliasMatch ^/image/(.*)\.gif$ /files/gif.images/$1.gif
+    </code></p></div>
+
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -316,6 +368,17 @@ of the current URL</td></tr>
       RedirectMatch (.*)\.gif$ http://www.anotherserver.com$1.jpg
     </code></p></div>
 
+    <p>The considerations related to the difference between
+    <code class="directive"><a href="#alias">Alias</a></code> and
+    <code class="directive"><a href="#aliasmatch">AliasMatch</a></code>
+    also apply to the difference between
+    <code class="directive"><a href="#redirect">Redirect</a></code> and
+    <code class="directive"><a href="#redirectmatch">RedirectMatch</a></code>.
+    See <code class="directive"><a href="#aliasmatch">AliasMatch</a></code> for
+    details.</p>
+
+
+
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="RedirectPermanent" id="RedirectPermanent">RedirectPermanent</a> <a name="redirectpermanent" id="redirectpermanent">Directive</a></h2>
@@ -450,6 +513,25 @@ and designates the target as a CGI script</td></tr>
       ScriptAliasMatch ^/cgi-bin(.*) /usr/local/apache/cgi-bin$1
     </code></p></div>
 
+    <p>As for AliasMatch, the full range of <a class="glossarylink" href="../glossary.html#rexex" title="see glossary">regular
+    expression</a> power is available.
+    For example, it is possible to construct an alias with case-insensitive
+    matching of the url-path:</p>
+
+    <div class="example"><p><code>
+      ScriptAliasMatch (?i)^/cgi-bin(.*) /usr/local/apache/cgi-bin$1
+    </code></p></div>
+
+    <p>The considerations related to the difference between
+    <code class="directive"><a href="#alias">Alias</a></code> and
+    <code class="directive"><a href="#aliasmatch">AliasMatch</a></code>
+    also apply to the difference between
+    <code class="directive"><a href="#scriptalias">ScriptAlias</a></code> and
+    <code class="directive"><a href="#scriptaliasmatch">ScriptAliasMatch</a></code>.
+    See <code class="directive"><a href="#aliasmatch">AliasMatch</a></code> for
+    details.</p>
+
+
 </div>
 </div>
 <div class="bottomlang">