From: Eric Covener <covener@apache.org>
Date: Tue, 24 Mar 2015 13:06:47 +0000 (+0000)
Subject: xforms
X-Git-Tag: 2.4.13~328
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7cc955d4cd91c06f512c91d139e0160b86e3e65;p=thirdparty%2Fapache%2Fhttpd.git

xforms


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1668877 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en
index faab9608007..139c4391600 100644
--- a/docs/manual/mod/mod_rewrite.html.en
+++ b/docs/manual/mod/mod_rewrite.html.en
@@ -130,6 +130,10 @@ URLs on the fly</td></tr>
                <code class="directive">RewriteRule</code>, suffixed by the relative 
                substitution is also valid as a URL path on the server 
                (this is rare).</li>
+          <li> In Apache HTTP Server 2.4.13 and later, this directive may be 
+                omitted when the request is mapped via 
+                <code class="directive"><a href="../mod/mod_alias.html#alias">Alias</a></code>
+                or <code class="module"><a href="../mod/mod_userdir.html">mod_userdir</a></code>.</li>
       </ul>
 
 <p> In the example below, <code class="directive">RewriteBase</code> is necessary
@@ -138,7 +142,7 @@ URLs on the fly</td></tr>
     misconfiguration would normally cause the server to look for an "opt"
     directory under the document root.</p>
 <pre class="prettyprint lang-config">DocumentRoot /var/www/example.com
-Alias /myapp /opt/myapp-1.2.3
+AliasMatch ^/myapp /opt/myapp-1.2.3
 &lt;Directory /opt/myapp-1.2.3&gt;
     RewriteEngine On
     RewriteBase /myapp/
@@ -146,6 +150,7 @@ Alias /myapp /opt/myapp-1.2.3
 &lt;/Directory&gt;</pre>
 
 
+
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="RewriteCond" id="RewriteCond">RewriteCond</a> <a name="rewritecond" id="rewritecond">Directive</a></h2>
@@ -965,8 +970,21 @@ later</td></tr>
       default behavior in 2.4.0 through 2.4.3, and the flag to restore it is
       available Apache HTTP Server 2.4.4 and later.</p>
       </dd>
-      </dl>
 
+      <dt><code>IgnoreContextInfo</code></dt>
+      <dd>
+
+      <p>In versions 2.4.13 and later, when a relative substitution is made
+         in directory (htaccess) context and <code class="directive"><a href="#rewritebase">RewriteBase</a></code> has not been set, this module uses some
+         extended URL and filesystem context information to change the 
+         relative substitution back into a URL. Modules such as 
+         <code class="module"><a href="../mod/mod_userdir.html">mod_userdir</a></code> and <code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code>
+         supply this extended context info.  This option disables the behavior
+         introduced in 2.4.13 and should only be set if all of the conditions 
+         above are present and a substituion has an unexpected result.  </p>
+      </dd>
+
+      </dl>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>