From: Eric Covener <covener@apache.org>
Date: Fri, 29 Oct 2010 15:28:49 +0000 (+0000)
Subject: Merge r1028797, r1028799 from trunk:
X-Git-Tag: 2.0.65~155
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1aaf5748ca9be868d4222ec97275720c2cfeda3b;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1028797, r1028799 from trunk:

  Add a note about LimitRequest* and name-based vhosts as followup on PR#7741

  make the name-based vhost note a warning based on offline discussion with Rich


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

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index baf5d997f57..91fdb330bd9 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -1704,6 +1704,12 @@ will be accepted from the client</description>
       LimitRequestFields 50
     </example>
 
+     <note type="warning"><title>Warning</title>
+     <p> When name-based virtual hosting is used, the value for this
+     directive is taken from the default (first-listed) virtual host for the
+     <directive>NameVirtualHost</directive> the connection was mapped to.</p>
+     </note>
+
 </usage>
 </directivesynopsis>
 
@@ -1746,6 +1752,12 @@ client</description>
     limit above the compiled-in value of DEFAULT_LIMIT_REQUEST_FIELDSIZE
     (8190 as distributed).
     </note>
+ 
+     <note type="warning"><title>Warning</title>
+     <p> When name-based virtual hosting is used, the value for this
+     directive is taken from the default (first-listed) virtual host for the
+     <directive>NameVirtualHost</directive> the connection was mapped to.</p>
+     </note>
 
 </usage>
 </directivesynopsis>
@@ -1787,6 +1799,13 @@ from the client</description>
 
     <note>Under normal conditions, the value should not be changed from
     the default.</note>
+
+    <note type="warning"><title>Warning</title>
+    <p> When name-based virtual hosting is used, the value for this
+    directive is taken from the default (first-listed) virtual host for the
+    <directive>NameVirtualHost</directive> the connection was mapped to.</p>
+    </note>
+
 </usage>
 </directivesynopsis>