svn commit: r265518 - /httpd/httpd/trunk/server/mpm/worker/worker.c

[co...@apache.org]

Author: colm
Date: Wed Aug 31 09:01:13 2005
New Revision: 265518

URL: http://svn.apache.org/viewcvs?rev=265518&view=rev
Log:

Actually allow the admin to set thread_limit higher than the default. 

Also, initialise the first_ variables, since they are tested in the
set_ functions.


Modified:
    httpd/httpd/trunk/server/mpm/worker/worker.c

Modified: httpd/httpd/trunk/server/mpm/worker/worker.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/server/mpm/worker/worker.c?rev=265518&r1=265517&r2=265518&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/worker/worker.c (original)
+++ httpd/httpd/trunk/server/mpm/worker/worker.c Wed Aug 31 09:01:13 2005
@@ -120,9 +120,9 @@
 static int max_spare_threads = 0;
 static int ap_daemons_limit = 0;
 static int server_limit = DEFAULT_SERVER_LIMIT;
-static int first_server_limit;
+static int first_server_limit = 0;
 static int thread_limit = DEFAULT_THREAD_LIMIT;
-static int first_thread_limit;
+static int first_thread_limit = 0;
 static int changed_limit_at_restart;
 static int dying = 0;
 static int workers_may_exit = 0;
@@ -2097,7 +2097,7 @@
     }
 
     ap_threads_per_child = atoi(arg);
-    if (ap_threads_per_child > thread_limit) {
+    if (first_thread_limit && ap_threads_per_child > thread_limit) {
         ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, 
                      "WARNING: ThreadsPerChild of %d exceeds ThreadLimit "
                      "value of %d", ap_threads_per_child,