Rename ReqTimeout into RequestTimeout, to be more in line with other

directives.

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

diff --git a/docs/manual/mod/mod_reqtimeout.xml b/docs/manual/mod/mod_reqtimeout.xml
index 9ffe517a149b5ecd992bbe4192793d838ddb8526..104313e0d209d3c499576982e7c9d54c1418adc6 100644 (file)
--- a/docs/manual/mod/mod_reqtimeout.xml
+++ b/docs/manual/mod/mod_reqtimeout.xml
@@ -38,7 +38,7 @@
         30 seconds for receiving the request body:
 
         <example>
-          ReqTimeout headerinit=10 bodyinit=30
+          RequestTimeout headerinit=10 bodyinit=30
         </example>
       </li>
 
@@ -49,7 +49,7 @@
         request including the headers:
 
         <example>
-          ReqTimeout headerinit=10 headerminrate=500 headermax=30
+          RequestTimeout headerinit=10 headerminrate=500 headermax=30
         </example>
       </li>
 
@@ -61,7 +61,7 @@
         <directive module="core">LimitRequestBody</directive>):
 
         <example>
-          ReqTimeout bodyinit=10 bodyminrate=1000
+          RequestTimeout bodyinit=10 bodyminrate=1000
         </example>
       </li>
 
@@ -69,10 +69,10 @@
 </section>
 
 <directivesynopsis>
-<name>ReqTimeout</name>
+<name>RequestTimeout</name>
 <description>Set timeout values for receiving request headers and body from client.
 </description>
-<syntax>ReqTimeout
+<syntax>RequestTimeout
 [headerinit=<var>time</var>
 [headerminrate=<var>rate</var> [headermax=<var>time</var>]]]
 [bodyinit=<var>time</var>
@@ -96,9 +96,11 @@
     (usually the case on Linux and FreeBSD), the socket is not sent to the
     server process before at least one byte (or the whole request for
     <code>httpready</code>) is received. The header timeout configured with
-    <code>ReqTimeout</code> is only effective after the server process has
+    <code>RequestTimeout</code> is only effective after the server process has
     received the socket.</p>
 
+    <p>For the timeout parameters, the value 0 means no limit.</p>
+
     <dl>
 
     <dt><code>headerinit</code></dt>

diff --git a/modules/filters/mod_reqtimeout.c b/modules/filters/mod_reqtimeout.c
index ffaf7d0e8b2ce608283276078004a558898ff541..b8e1750d568b25130c8dce246071e25941612032 100644 (file)
--- a/modules/filters/mod_reqtimeout.c
+++ b/modules/filters/mod_reqtimeout.c
@@ -331,7 +331,7 @@ static const char *set_reqtimeout_param(reqtimeout_srv_cfg *conf,
         }
     }
     else {
-        ret = "unknown ReqTimeout parameter";
+        ret = "unknown RequestTimeout parameter";
     }
     return ret;
     
@@ -351,7 +351,7 @@ static const char *set_reqtimeouts(cmd_parms *cmd, void *mconfig,
         word = ap_getword_conf(cmd->pool, &arg);
         val = strchr(word, '=');
         if (!val) {
-            return "Invalid ReqTimeout parameter. Parameter must be "
+            return "Invalid RequestTimeout parameter. Parameter must be "
             "in the form 'key=value'";
         }
         else
@@ -360,7 +360,8 @@ static const char *set_reqtimeouts(cmd_parms *cmd, void *mconfig,
         err = set_reqtimeout_param(conf, cmd->pool, word, val);
         
         if (err)
-            return apr_pstrcat(cmd->temp_pool, "ReqTimeout: ", err, " ", word, "=", val, "; ", NULL);
+            return apr_pstrcat(cmd->temp_pool, "RequestTimeout: ", err, " ",
+                               word, "=", val, "; ", NULL);
     }
     
     return NULL;
@@ -384,7 +385,7 @@ static void reqtimeout_hooks(apr_pool_t *pool)
 }
 
 static const command_rec reqtimeout_cmds[] = {
-    AP_INIT_RAW_ARGS("ReqTimeout", set_reqtimeouts, NULL, RSRC_CONF,
+    AP_INIT_RAW_ARGS("RequestTimeout", set_reqtimeouts, NULL, RSRC_CONF,
                      "Adjust various Request Timeout parameters"),
     {NULL}
 };