diff options
| author | Stefan Fritsch <sf@apache.org> | 2011-01-09 23:47:33 +0100 |
|---|---|---|
| committer | Stefan Fritsch <sf@apache.org> | 2011-01-09 23:47:33 +0100 |
| commit | 5ad5328aa302978a8f3b37b62521601e2c7d64d8 (patch) | |
| tree | 9663c1613c610eac70a477b3b168bc94a45f4166 /server/mpm/prefork/prefork.c | |
| parent | Don't log AuthMerging XXX as <RequireXXX> (diff) | |
| download | apache2-5ad5328aa302978a8f3b37b62521601e2c7d64d8.tar.xz apache2-5ad5328aa302978a8f3b37b62521601e2c7d64d8.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | server/mpm/prefork/prefork.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c index 08a53a3ca7..f59ac540b8 100644 --- 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; |