Merge r653856 and r655438 from trunk:

note that KeepAliveTimeout of the first defined virtual host
in the set of NameVirtualHost will be used

PR: 36770

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

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index e01312de92ffaec3f426cb3b4c9118c878f2241b..eb7d3b3e44d6fedeac5a64742cff1d9532018445 100644 (file)
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -1577,6 +1577,11 @@ requests on a persistent connection</description>
     may cause performance problems in heavily loaded servers. The
     higher the timeout, the more server processes will be kept
     occupied waiting on connections with idle clients.</p>
+    
+    <p>In a name-based virtual host context, the value of the first
+    defined virtual host (the default host) in a set of <directive
+    module="core">NameVirtualHost</directive> will be used.
+    The other values will be ignored.</p>
 </usage>
 </directivesynopsis>