Commit 6c74ea9a authored Jun 26, 2012 by Richard Bowen

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

parent e8e31fac

docs/manual/mod/mod_proxy.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -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

docs/manual/mod/mod_ssl.xml

+7 −0

Original line number	Diff line number	Diff line
		@@ -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 <Proxy> or <ProxyRequest> directives.
		SSLProxyEngine is not required to enable a forward proxy server to
		proxy SSL/TLS requests.</p>

		<example><title>Example</title>
		<VirtualHost _default_:443><br />
		SSLProxyEngine on<br />