Patch from Mark Watts. Mention ProxyErrorOverride.

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

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 4af448e96ce6f3bf0a7fee2ddd34323f601afe3d..b836e10c1a0a4b7d6c787030449467bb182e6b3d 100644 (file)
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -1066,6 +1066,11 @@ in case of an error</td></tr>
     will be immediately halted and the internal error message returned.
     This is necessary to guard against security problems caused by
     bad requests.</p>
+   
+    <p>If you are using mod_proxy, you may wish to enable
+    <code class="directive"><a href="../mod/mod_proxy.html#proxyerroroverride">ProxyErrorOverride</a></code> so that you can provide
+    custom error messages on behalf of your Origin servers. If you don't enable ProxyErrorOverride,
+    Apache will not generate custom error documents for proxied content.</p>
 
 <h3>See also</h3>
 <ul>

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index c778bb6ad60bfd50a4ce55a3f89243f717945e04..2178f82b6896b3775b592c99266ff3c23633642a 100644 (file)
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -1028,6 +1028,11 @@ in case of an error</description>
     will be immediately halted and the internal error message returned.
     This is necessary to guard against security problems caused by
     bad requests.</p>
+   
+    <p>If you are using mod_proxy, you may wish to enable
+    <directive module="mod_proxy">ProxyErrorOverride</directive> so that you can provide
+    custom error messages on behalf of your Origin servers. If you don't enable ProxyErrorOverride,
+    Apache will not generate custom error documents for proxied content.</p>
 </usage>
 
 <seealso><a href="../custom-error.html">documentation of