From: Rich Bowen <rbowen@apache.org>
Date: Tue, 26 Jun 2012 14:13:11 +0000 (+0000)
Subject: Applies patch from PR 53201, from Walter (wgoulet)
X-Git-Tag: 2.5.0-alpha~6694
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d94b31aa5710b77214cea8c690e7952dcdec1781;p=thirdparty%2Fapache%2Fhttpd.git

Applies patch from PR 53201, from Walter (wgoulet)


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

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index e1f8dffe1b8..d87349cee9f 100644
--- 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 36145f1ac5b..a0407ac04b0 100644
--- a/docs/manual/mod/mod_ssl.xml
+++ b/docs/manual/mod/mod_ssl.xml
@@ -1792,6 +1792,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 <Proxy> or <ProxyRequest> 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;