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

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

diff --git a/CHANGES b/CHANGES
index 66f0c0b0e29bd116b43bdbe5ce96922ce6e29d46..8b702e627fc1197e70fb6000cbbc0b7f8c338465 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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]
 

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 08a53a3ca743e6cc619bc4c5ec3a1c970d1c3d84..f59ac540b82fd8da739fe2170ccaa464f441f214 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -263,7 +263,7 @@ static int prefork_query(int query_code, int *result, apr_status_t *rv)
         *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, int *result, apr_status_t *rv)
         *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;