From: Rich Bowen <rbowen@apache.org>
Date: Tue, 26 Jun 2012 16:20:25 +0000 (+0000)
Subject: Applying patch from PR 53201
X-Git-Tag: 2.2.23~147
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f52ed996ea46bfdb59084957e8bb28c847fc87f9;p=thirdparty%2Fapache%2Fhttpd.git

Applying patch from PR 53201


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

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index e6e5c4e92e5..eee3af85dad 100644
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -555,6 +555,9 @@ request</description>
     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 54796751a4d..77a8dcf38bb 100644
--- a/docs/manual/mod/mod_ssl.xml
+++ b/docs/manual/mod/mod_ssl.xml
@@ -1596,6 +1596,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>
 &lt;VirtualHost _default_:443&gt;<br />
 SSLProxyEngine on<br />