From: Joe Orton <jorton@apache.org>
Date: Fri, 30 Oct 2020 10:28:30 +0000 (+0000)
Subject: Document that KeepAliveTimeout still applies regardless of
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1172
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=617985b04670c88f291cd904aef1ba3c11be78ac;p=thirdparty%2Fapache%2Fhttpd.git

Document that KeepAliveTimeout still applies regardless of
how RequestReadTimeout is used (had some user confusion by this
since the behaviour changed within 2.4.x, e.g. PR 56729).

[skip ci]


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

diff --git a/docs/manual/mod/mod_reqtimeout.xml b/docs/manual/mod/mod_reqtimeout.xml
index 391be0fecf8..7b4d3e6d112 100644
--- a/docs/manual/mod/mod_reqtimeout.xml
+++ b/docs/manual/mod/mod_reqtimeout.xml
@@ -132,6 +132,12 @@ the request headers and/or body from client.
     configured with <directive>RequestReadTimeout</directive> are only effective
     after the server process has received the socket.</p>
 
+    <p>When waiting for a subsequent request on a kept-alive
+    connection, the timeout configured by <directive
+    module="core">KeepAliveTimeout</directive> applies regardless of
+    whether <directive>RequestReadTimeout</directive> is also
+    used.</p>
+    
     <p>For each of the three timeout stages (handshake, header or body), there are
     three ways to specify the timeout:
     </p>