From 134204235b0cb6bcfb286c09d315e89e1a5fb1a0 Mon Sep 17 00:00:00 2001 From: Luca Toscano Date: Tue, 31 Jan 2017 09:46:42 +0000 Subject: [PATCH] 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 --- docs/manual/mod/core.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index 17a4994996..0fe29ea7b9 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -4547,8 +4547,9 @@ certain events before failing a request for an acknowledgement of a packet if the send buffer is full. -
  • In mod_cgi, the length of time to wait for - output from a CGI script.
    • +
  • In mod_cgi and mod_cgid, + the length of time to wait for any individual block of output + from a CGI script.
  • In mod_ext_filter, the length of time to wait for output from a filtering process.
    • -- 2.40.0