From: Rainer Jung <rjung@apache.org>
Date: Fri, 12 Feb 2010 10:00:54 +0000 (+0000)
Subject: Update transformations.
X-Git-Tag: 2.3.6~485
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad214bc50aff352b7742ef1e4c5ccc2868c97129;p=thirdparty%2Fapache%2Fhttpd.git

Update transformations.


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

diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index e8a515f34f1..6117c7d4dcc 100644
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -1283,8 +1283,9 @@ connections</td></tr>
     </code></p></div>
 
     <p><var>scheme</var> is effectively the protocol that should be used to
-    communicate with the remote server; only <code>http</code> is supported by
-    this module.</p>
+    communicate with the remote server; only <code>http</code> and <code>https</code>
+    are supported by this module. When using <code>https</code>, the requests
+    are forwarded through the remote proxy using the HTTP CONNECT method.</p>
 
     <div class="example"><h3>Example</h3><p><code>
       ProxyRemote http://goodguys.example.com/ http://mirrorguys.example.com:8000<br />
diff --git a/docs/manual/mod/mod_proxy_connect.html.en b/docs/manual/mod/mod_proxy_connect.html.en
index 300d8d2868d..c3e13b3ed06 100644
--- a/docs/manual/mod/mod_proxy_connect.html.en
+++ b/docs/manual/mod/mod_proxy_connect.html.en
@@ -39,6 +39,11 @@
     requests, <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> and
     <code class="module"><a href="../mod/mod_proxy_connect.html">mod_proxy_connect</a></code> have to be present in the server.</p>
 
+    <p>CONNECT is also used, when the server needs to send an HTTPS request
+    through a forward proxy. In this case the server acts as a CONNECT client.
+    This functionality is part of <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> and
+    <code class="module"><a href="../mod/mod_proxy_connect.html">mod_proxy_connect</a></code> is not needed in this case.</p>
+
     <div class="warning"><h3>Warning</h3>
       <p>Do not enable proxying until you have <a href="mod_proxy.html#access">secured your server</a>. Open proxy
       servers are dangerous both to your network and to the Internet at
diff --git a/docs/manual/mod/mod_proxy_http.html.en b/docs/manual/mod/mod_proxy_http.html.en
index 80ac8448bf1..893a68a9cc6 100644
--- a/docs/manual/mod/mod_proxy_http.html.en
+++ b/docs/manual/mod/mod_proxy_http.html.en
@@ -32,7 +32,7 @@
 <h3>Summary</h3>
 
     <p>This module <em>requires</em> the service of <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code>. It provides the features used for
-    proxying HTTP requests. <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code>
+    proxying HTTP and HTTPS requests. <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code>
     supports HTTP/0.9, HTTP/1.0 and HTTP/1.1. It does <em>not</em>
     provide any caching abilities. If you want to set up a caching
     proxy, you might want to use the additional service of the