Rename BeOS MPM directive RequestsPerThread to MaxRequestsPerThread.

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

diff --git a/CHANGES b/CHANGES
index 0cd29ff6abaee44c50fc1f38a0cd1b723adb78c1..4e581a514bac9f2f296e2e14bbe0814de87484f7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.31-dev
 
+  *) Rename BeOS MPM directive RequestsPerThread to MaxRequestsPerThread.
+     [Lars Eilebrecht]
+
   *) Split out blocking from the mode in the input filters.
      [Justin Erenkrantz]
 

diff --git a/docs/conf/httpd-std.conf b/docs/conf/httpd-std.conf
index c63718c96991328285d3462c93b265a535a9e0f1..53e8e83ea62e51ad180f60215bb7d15213ec6448 100644 (file)
--- a/docs/conf/httpd-std.conf
+++ b/docs/conf/httpd-std.conf
@@ -164,12 +164,11 @@ MaxRequestsPerChild  0
 # BeOS MPM
 # StartThreads: how many threads do we initially spawn?
 # MaxClients:   max number of threads we can have (1 thread == 1 client)
-# RequestsPerThread: maximum number of requests each thread will process before
-#                    exiting
+# MaxRequestsPerThread: maximum number of requests each thread will process
 <IfModule beos.c>
 StartThreads               10
 MaxClients                 50
-RequestsPerThread       10000
+MaxRequestsPerThread       10000
 </IfModule>    
 
 # NetWare MPM

diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c
index 57d34ef80eb453468b19ad7c5aceb3ab4739aacc..af6baf899ea45b39be920d2e3c09917b762f53f3 100644 (file)
--- a/server/mpm/beos/beos.c
+++ b/server/mpm/beos/beos.c
@@ -1110,7 +1110,7 @@ static const char *set_threads_limit (cmd_parms *cmd, void *dummy, const char *a
     return NULL;
 }
 
-static const char *set_requests_per_thread (cmd_parms *cmd, void *dummy, const char *arg)
+static const char *set_max_requests_per_thread (cmd_parms *cmd, void *dummy, const char *arg)
 {
     const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
     if (err != NULL) {
@@ -1139,7 +1139,7 @@ AP_INIT_TAKE1( "MaxSpareThreads", set_max_spare_threads, NULL, RSRC_CONF,
   "Maximum number of idle children" ),
 AP_INIT_TAKE1( "MaxClients", set_threads_limit, NULL, RSRC_CONF, 
   "Maximum number of children alive at the same time (max threads)" ),
-AP_INIT_TAKE1( "RequestsPerThread", set_requests_per_thread, NULL, RSRC_CONF,
+AP_INIT_TAKE1( "MaxRequestsPerThread", set_max_requests_per_thread, NULL, RSRC_CONF,
   "Maximum number of requests served by a thread" ),
 { NULL }
 };