From: Lars Eilebrecht Date: Sun, 20 Jan 2002 06:49:20 +0000 (+0000) Subject: Rename BeOS MPM directive RequestsPerThread to MaxRequestsPerThread. X-Git-Tag: 2.0.31~140 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f01fdd7095aaaa33967db8558d53942a83874be0;p=apache 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 0cd29ff6ab..4e581a514b 100644 --- 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 c63718c969..53e8e83ea6 100644 --- 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 StartThreads 10 MaxClients 50 -RequestsPerThread 10000 +MaxRequestsPerThread 10000 # NetWare MPM diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c index 57d34ef80e..af6baf899e 100644 --- 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 } };