From: Luca Toscano <elukey@apache.org>
Date: Tue, 31 Jan 2017 09:46:42 +0000 (+0000)
Subject: Merge r1780907, r1780918 from trunk:
X-Git-Tag: 2.4.26~346
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=134204235b0cb6bcfb286c09d315e89e1a5fb1a0;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1780907, r1780918 from trunk:

Add more info about the role of Timeout for mod_cgi

PR 60404 asks if the Timeout directive is related to
the amount of time to wait for the entire CGI script's
output or only the first byte received.
Checking in mod_cgi.c -> cgi_bucket_read shows a
apr_pollset_poll that should support the latter.



Reworded the Timeout documentation about mod_cgi[d]

After a chat with Yann and Eric on dev@, we agreed to
simplify the description.



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

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 17a49949961..0fe29ea7b91 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -4547,8 +4547,9 @@ certain events before failing a request</description>
       for an acknowledgement of a packet if the send buffer is
       full.</li>
 
-      <li>In <module>mod_cgi</module>, the length of time to wait for
-      output from a CGI script.</li>
+      <li>In <module>mod_cgi</module> and <module>mod_cgid</module>,
+      the length of time to wait for any individual block of output
+      from a CGI script.</li>
 
       <li>In <module>mod_ext_filter</module>, the length of time to
       wait for output from a filtering process.</li>