Applying patch from PR 53201.

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

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index e1f8dffe1b87968aaf71210534d9be84105d405e..d87349cee9f7f6f31bd0b18167e5af7c5e4f45ec 100644 (file)
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -562,6 +562,9 @@ context in 2.3.3 and later.</compatibility>
     need also <module>mod_proxy_http</module> or <module>mod_proxy_ftp</module>
     (or both) present in the server.</p>
 
+    <p>In order to get the functionality of proxying HTTPS sites, you
+    need <module>mod_proxy_connect</module> enabled in the server.</p>
+
     <note type="warning"><title>Warning</title>
       <p>Do not enable proxying with <directive
       module="mod_proxy">ProxyRequests</directive> until you have <a

diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml
index 9a40a4d7c0ccbbd9f7ada59dfebf6429229dc082..b4886465137fddae2f3d4eed14b483489a29fa1c 100644 (file)
--- a/docs/manual/mod/mod_ssl.xml
+++ b/docs/manual/mod/mod_ssl.xml
@@ -1737,6 +1737,13 @@ is usually used inside a <directive module="core"
 type="section">VirtualHost</directive> section to enable SSL/TLS for proxy
 usage in a particular virtual host. By default the SSL/TLS Protocol Engine is
 disabled for proxy image both for the main server and all configured virtual hosts.</p>
+
+<p>Note that the SSLProxyEngine directive should not, in
+general, be included in a virtual host that will be acting as a
+forward proxy (using &lt;Proxy&gt; or &lt;ProxyRequest&gt; directives.
+SSLProxyEngine is not required to enable a forward proxy server to
+proxy SSL/TLS requests.</p>
+
 <example><title>Example</title>
 <highlight language="config">
 &lt;VirtualHost _default_:443&gt;