From: Takashi Sato <takashi@apache.org>
Date: Mon, 12 May 2008 11:53:23 +0000 (+0000)
Subject: Merge r653856 and r655438 from trunk:
X-Git-Tag: 2.0.64~171
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f5636e47512c58af80a16a1dd8d0f8b304d78f8;p=thirdparty%2Fapache%2Fhttpd.git

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.0.x@655483 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index e15aac60d8c..d06821f172b 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -1494,6 +1494,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>