From: Ruediger Pluem <rpluem@apache.org>
Date: Sat, 16 Aug 2008 19:29:49 +0000 (+0000)
Subject: Merge r686540, r686541, r686542, r686547 from trunk:
X-Git-Tag: 2.2.10~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae94bfd0dc7c138a1719fea8ea659e0ec140bc9b;p=thirdparty%2Fapache%2Fhttpd.git

Merge r686540, r686541, r686542, r686547 from trunk:

* Note further env variables and that their documentation can be found
  in mod_proxy_http.

* Write variable in lowercase.

* Fix error in default setting for ProxyTimeout

Submitted by: rpluem
Reviewed by: rpluem


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

diff --git a/docs/manual/env.xml b/docs/manual/env.xml
index ac5b7a54c0f..125dd753bfd 100644
--- a/docs/manual/env.xml
+++ b/docs/manual/env.xml
@@ -389,10 +389,11 @@
 
    </section>
 
-   <section id="proxy"><title>force-proxy-request-1.0, proxy-nokeepalive, proxy-sendchunked, proxy-sendcl</title>
+   <section id="proxy"><title>force-proxy-request-1.0, proxy-nokeepalive, proxy-sendchunked,
+   proxy-sendcl, proxy-chain-auth, proxy-interim-response</title>
 
    <p>These directives alter the protocol behavior of
-   <module>mod_proxy</module>.  See the <module>mod_proxy</module>
+   <module>mod_proxy</module>.  See the <module>mod_proxy</module> and <module>mod_proxy_http</module>
    documentation for more details.</p>
    </section>
 
diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index 67c310a68eb..8bfc3187b07 100644
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -782,7 +782,7 @@ expressions</description>
         clears the in-error flag.
     </td></tr>
     <tr><td>timeout</td>
-        <td><directive>ProxyTimeout</directive></td>
+        <td><directive module="mod_proxy">ProxyTimeout</directive></td>
         <td>Connection timeout in seconds.
         The number of seconds Apache waits for data sent by / to the backend.
     </td></tr>
@@ -1297,7 +1297,7 @@ directly</description>
 <name>ProxyTimeout</name>
 <description>Network timeout for proxied requests</description>
 <syntax>ProxyTimeout <var>seconds</var></syntax>
-<default>ProxyTimeout 300</default>
+<default>Value of <directive module="core">Timeout</directive></default>
 <contextlist><context>server config</context><context>virtual host</context>
 </contextlist>
 <compatibility>Available in Apache 2.0.31 and later</compatibility>
diff --git a/docs/manual/mod/mod_proxy_http.xml b/docs/manual/mod/mod_proxy_http.xml
index a39b6de5559..f92a86facc2 100644
--- a/docs/manual/mod/mod_proxy_http.xml
+++ b/docs/manual/mod/mod_proxy_http.xml
@@ -67,10 +67,10 @@
         <dt>proxy-nokeepalive</dt>
         <dd>Forces the proxy to close the backend connection after
         each request.</dd>
-        <dt>Proxy-Chain-Auth</dt>
+        <dt>proxy-chain-auth</dt>
         <dd>If the proxy requires authentication, it will read and
         consume the proxy authentication credentials sent by the client.
-        With <var>Proxy-Chain-Auth</var> it will <em>also</em> forward
+        With <var>proxy-chain-auth</var> it will <em>also</em> forward
         the credentials to the next proxy in the chain.  This may
         be necessary if you have a chain of proxies that share
         authentication information.  <strong>Security Warning:</strong>