From: Nick Kew <niq@apache.org>
Date: Thu, 10 Nov 2011 00:51:42 +0000 (+0000)
Subject: proxy-html.conf needs to be included automatically
X-Git-Tag: 2.3.16~212
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f0054152098177686b2dd12c5b12b304789b13b;p=apache

proxy-html.conf needs to be included automatically
if mod_proxy_html is loaded.  Otherwise it's a big
gotcha when mod_proxy_html just does nothing at all!


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

diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in
index 57a9f2cb58..d59952f366 100644
--- a/docs/conf/httpd.conf.in
+++ b/docs/conf/httpd.conf.in
@@ -388,8 +388,10 @@ LogLevel warn
 # Various default settings
 #Include @rel_sysconfdir@/extra/httpd-default.conf
 
-# If mod_proxy_html is required
-#Include @rel_sysconfdir@/extra/proxy-html.conf
+# Configure mod_proxy_html to understand HTML4/XHTML1
+<IfModule proxy_html_module>
+Include @rel_sysconfdir@/extra/proxy-html.conf
+</IfModule>
 
 # Secure (SSL/TLS) connections
 #Include @rel_sysconfdir@/extra/httpd-ssl.conf