Commit 95dbb774 authored by Mike Rumph's avatar Mike Rumph
Browse files

Generated doc changes 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1696887 13f79535-47bb-0310-9956-ffa450edef68
parent 63b5e745

docs/manual/mod/mod_proxy.html.en

+16 −12
Original line number Diff line number Diff line
@@ -911,6 +911,18 @@ through</td></tr> 
    </p>

    </div>



    <p>When used inside a <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> section, the first argument is omitted and the local

    directory is obtained from the <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>. The same will occur inside a

    <code class="directive"><a href="../mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code> section;

    however, ProxyPass does not interpret the regexp as such, so it is necessary

    to use <code class="directive">ProxyPassMatch</code> in this situation instead.</p>



    <p>The ProxyPass directive is not supported in <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> or <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code> sections.</p>



    <p>If you require a more flexible reverse-proxy configuration, see the

    <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> directive with the

    <code>[P]</code> flag.</p>



    <p>The <code>!</code> directive is useful in situations where you don't want

    to reverse-proxy a subdirectory, <em>e.g.</em></p>
@@ -938,6 +950,8 @@ through</td></tr> 


    </div> 



    <p><strong>ProxyPass <code>key=value</code> Parameters</strong></p>



    <p>In Apache HTTP Server 2.1 and later, mod_proxy supports pooled

    connections to a backend server.  Connections created on demand

    can be retained in a pool for future use.  Limits on the pool size
@@ -1226,6 +1240,8 @@ through</td></tr> 
      &lt;/Proxy&gt;

    </code></p></div>



    <p><strong>Additional ProxyPass Keywords</strong></p>



    <p>Normally, mod_proxy will canonicalise ProxyPassed URLs.

    But this may be incompatible with some backends, particularly those

    that make use of <var>PATH_INFO</var>.  The optional <var>nocanon</var>
@@ -1234,18 +1250,6 @@ through</td></tr> 
    as it removes the normal limited protection against URL-based attacks

    provided by the proxy.</p>



    <p>When used inside a <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code> section, the first argument is omitted and the local

    directory is obtained from the <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>. The same will occur inside a

    <code class="directive"><a href="../mod/core.html#locationmatch">&lt;LocationMatch&gt;</a></code> section;

    however, ProxyPass does not interpret the regexp as such, so it is necessary

    to use <code class="directive">ProxyPassMatch</code> in this situation instead.</p>

  

    <p>This directive is not supported in <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> or <code class="directive"><a href="../mod/core.html#files">&lt;Files&gt;</a></code> sections.</p>



    <p>If you require a more flexible reverse-proxy configuration, see the

    <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> directive with the

    <code>[P]</code> flag.</p>



    <p>The optional <var>interpolate</var> keyword (available in

    httpd 2.2.9 and later), in combination with

    <code class="directive">ProxyPassInterpolateEnv</code>, causes the ProxyPass

docs/manual/mod/mod_proxy.xml.fr

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0"?>

<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">

<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>

<!-- English Revision: 1559613:1696472 (outdated) -->

<!-- English Revision: 1559613:1696886 (outdated) -->

<!-- French translation : Lucien GENTIS -->

<!-- Reviewed by : Vincent Deffontaines -->

docs/manual/mod/mod_proxy.xml.ja

+1 −1
Original line number Diff line number Diff line 
<?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: 1212598:1696472 (outdated) -->

<!-- English Revision: 1212598:1696886 (outdated) -->



<!--

 Licensed to the Apache Software Foundation (ASF) under one or more