From: Joe Orton <jorton@apache.org>
Date: Tue, 11 Feb 2020 16:22:58 +0000 (+0000)
Subject: Merge r1873913 from trunk:
X-Git-Tag: 2.4.42~98
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c03bf286e6a2aa24867e285d5c56e59cc5044938;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1873913 from trunk:

Clarify compatibility and interpretation of CGIDScriptTimeout. [skip ci]




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

diff --git a/docs/manual/mod/mod_cgid.xml b/docs/manual/mod/mod_cgid.xml
index a901ebb5d01..90327a969d9 100644
--- a/docs/manual/mod/mod_cgid.xml
+++ b/docs/manual/mod/mod_cgid.xml
@@ -108,12 +108,11 @@ the cgi daemon</description>
 CGI program</description>
 <syntax>CGIDScriptTimeout <var>time</var>[s|ms]</syntax>
 <default>value of <directive module="core">Timeout</directive> directive when 
-unset</default>
+unset or set to 0</default>
 <contextlist><context>server config</context>
 <context>virtual host</context><context>directory</context>
 <context>.htaccess</context></contextlist>
-<compatibility>CGIDScriptTimeout defaults to zero in releases 2.4 and earlier
-</compatibility>
+<compatibility>Available in httpd 2.4.10 and later; in prior releases no timeout was applied</compatibility>
 
 <usage>
     <p>This directive limits the length of time to wait for more output from