You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sf...@apache.org on 2011/01/09 23:47:33 UTC
svn commit: r1057045 - in /httpd/httpd/trunk: CHANGES
server/mpm/prefork/prefork.c
Author: sf
Date: Sun Jan 9 22:47:33 2011
New Revision: 1057045
URL: http://svn.apache.org/viewvc?rev=1057045&view=rev
Log:
Fix ap_mpm_query results:
AP_MPMQ_MAX_THREADS: Single threaded means one thread per child, not zero
AP_MPMQ_MAX_DAEMONS: Max # daemons by config is determined by MaxClients, not
ServerLimit
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/server/mpm/prefork/prefork.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1057045&r1=1057044&r2=1057045&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sun Jan 9 22:47:33 2011
@@ -2,6 +2,9 @@
Changes with Apache 2.3.11
+ *) mpm_prefork: Fix ap_mpm_query results for AP_MPMQ_MAX_DAEMONS and
+ AP_MPMQ_MAX_THREADS.
+
*) mod_authz_core: Fix bug in merging logic if user-based and non-user-based
authorization directives were mixed. [Stefan Fritsch]
Modified: httpd/httpd/trunk/server/mpm/prefork/prefork.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/prefork/prefork.c?rev=1057045&r1=1057044&r2=1057045&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/prefork/prefork.c (original)
+++ httpd/httpd/trunk/server/mpm/prefork/prefork.c Sun Jan 9 22:47:33 2011
@@ -263,7 +263,7 @@ static int prefork_query(int query_code,
*result = HARD_THREAD_LIMIT;
break;
case AP_MPMQ_MAX_THREADS:
- *result = 0;
+ *result = 1;
break;
case AP_MPMQ_MIN_SPARE_DAEMONS:
*result = ap_daemons_min_free;
@@ -281,7 +281,7 @@ static int prefork_query(int query_code,
*result = ap_max_requests_per_child;
break;
case AP_MPMQ_MAX_DAEMONS:
- *result = server_limit;
+ *result = ap_daemons_limit;
break;
case AP_MPMQ_MPM_STATE:
*result = mpm_state;