From 4421663d68e55cc7d19b8b1fcfab18863ce00ca5 Mon Sep 17 00:00:00 2001 From: Cliff Woolley Date: Wed, 7 Nov 2001 05:29:58 +0000 Subject: [PATCH] Fix the spelling of the AP_MPMQ_MIN_SPARE_DAEMONS and AP_MPMQ_MAX_REQUESTS_DAEMON macros. Better to do it now rather than later. **WARNING** This will of course break the compile on any third-party MPMs you might have floating around, but it's a really quick change to make. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91777 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 6 +++++- include/ap_mpm.h | 6 +++--- server/mpm/beos/beos.c | 4 ++-- server/mpm/experimental/perchild/perchild.c | 4 ++-- server/mpm/mpmt_os2/mpmt_os2.c | 4 ++-- server/mpm/netware/mpm_netware.c | 4 ++-- server/mpm/perchild/perchild.c | 4 ++-- server/mpm/prefork/prefork.c | 4 ++-- server/mpm/spmt_os2/spmt_os2.c | 4 ++-- server/mpm/threaded/threaded.c | 4 ++-- server/mpm/winnt/mpm_winnt.c | 4 ++-- server/mpm/worker/worker.c | 4 ++-- 12 files changed, 28 insertions(+), 24 deletions(-) diff --git a/CHANGES b/CHANGES index dd9ab1b4bd..36e61e903e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,9 @@ Changes with Apache 2.0.28-dev - + + *) Fix the spelling of the AP_MPMQ_MIN_SPARE_DAEMONS and + AP_MPMQ_MAX_REQUESTS_DAEMON macros in ap_mpm.h and all standard + MPMs. [Cliff Woolley] + *) Introduce htdbm, a user management utility for db/dbm authorization databases. [Mladen Turk ] diff --git a/include/ap_mpm.h b/include/ap_mpm.h index d1d0fb05dc..d223984cc5 100644 --- a/include/ap_mpm.h +++ b/include/ap_mpm.h @@ -161,14 +161,14 @@ AP_DECLARE(apr_status_t) ap_os_create_privileged_process( #define AP_MPMQ_MAX_DAEMON_USED 1 /* Max # of daemons used so far */ #define AP_MPMQ_IS_THREADED 2 /* MPM can do threading */ #define AP_MPMQ_IS_FORKED 3 /* MPM can do forking */ -#define AP_MPMQ_HARD_LIMIT_DAEMONS 4 /* The compiled max # deamons */ +#define AP_MPMQ_HARD_LIMIT_DAEMONS 4 /* The compiled max # daemons */ #define AP_MPMQ_HARD_LIMIT_THREADS 5 /* The compiled max # threads */ #define AP_MPMQ_MAX_THREADS 6 /* # of threads/child by config */ -#define AP_MPMQ_MIN_SPARE_DEAMONS 7 /* Min # of spare daemons */ +#define AP_MPMQ_MIN_SPARE_DAEMONS 7 /* Min # of spare daemons */ #define AP_MPMQ_MIN_SPARE_THREADS 8 /* Min # of spare threads */ #define AP_MPMQ_MAX_SPARE_DAEMONS 9 /* Max # of spare daemons */ #define AP_MPMQ_MAX_SPARE_THREADS 10 /* Max # of spare threads */ -#define AP_MPMQ_MAX_REQUESTS_DEAMON 11 /* Max # of requests per daemon */ +#define AP_MPMQ_MAX_REQUESTS_DAEMON 11 /* Max # of requests per daemon */ #define AP_MPMQ_MAX_DAEMONS 12 /* Max # of daemons by config */ diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c index f94a3198b4..fa98a58b04 100644 --- a/server/mpm/beos/beos.c +++ b/server/mpm/beos/beos.c @@ -688,7 +688,7 @@ AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result) case AP_MPMQ_MAX_THREADS: *result = ap_threads_per_child; return APR_SUCCESS; - case AP_MPMQ_MIN_SPARE_DEAMONS: + case AP_MPMQ_MIN_SPARE_DAEMONS: *result = 0; return APR_SUCCESS; case AP_MPMQ_MIN_SPARE_THREADS: @@ -700,7 +700,7 @@ AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result) case AP_MPMQ_MAX_SPARE_THREADS: *result = min_spare_threads; return APR_SUCCESS; - case AP_MPMQ_MAX_REQUESTS_DEAMON: + case AP_MPMQ_MAX_REQUESTS_DAEMON: *result = ap_max_requests_per_child; return APR_SUCCESS; case AP_MPMQ_MAX_DAEMONS: diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c index 21bb3634b4..f2cb943ee7 100644 --- a/server/mpm/experimental/perchild/perchild.c +++ b/server/mpm/experimental/perchild/perchild.c @@ -236,7 +236,7 @@ AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result) case AP_MPMQ_MAX_THREADS: *result = max_threads; return APR_SUCCESS; - case AP_MPMQ_MIN_SPARE_DEAMONS: + case AP_MPMQ_MIN_SPARE_DAEMONS: *result = 0; return APR_SUCCESS; case AP_MPMQ_MIN_SPARE_THREADS: @@ -248,7 +248,7 @@ AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result) case AP_MPMQ_MAX_SPARE_THREADS: *result = max_spare_threads; return APR_SUCCESS; - case AP_MPMQ_MAX_REQUESTS_DEAMON: + case AP_MPMQ_MAX_REQUESTS_DAEMON: *result = max_requests_per_child; return APR_SUCCESS; case AP_MPMQ_MAX_DAEMONS: diff --git a/server/mpm/mpmt_os2/mpmt_os2.c b/server/mpm/mpmt_os2/mpmt_os2.c index 405147629b..04d95fdfc4 100644 --- a/server/mpm/mpmt_os2/mpmt_os2.c +++ b/server/mpm/mpmt_os2/mpmt_os2.c @@ -457,13 +457,13 @@ AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result) case AP_MPMQ_HARD_LIMIT_THREADS: *result = HARD_THREAD_LIMIT; return APR_SUCCESS; - case AP_MPMQ_MIN_SPARE_DEAMONS: + case AP_MPMQ_MIN_SPARE_DAEMONS: *result = 0; return APR_SUCCESS; case AP_MPMQ_MAX_SPARE_DAEMONS: *result = 0; return APR_SUCCESS; - case AP_MPMQ_MAX_REQUESTS_DEAMON: + case AP_MPMQ_MAX_REQUESTS_DAEMON: *result = ap_max_requests_per_child; return APR_SUCCESS; } diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c index ca094a740e..d91237d29c 100644 --- a/server/mpm/netware/mpm_netware.c +++ b/server/mpm/netware/mpm_netware.c @@ -218,7 +218,7 @@ AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result) case AP_MPMQ_MAX_THREADS: *result = ap_threads_limit; return APR_SUCCESS; - case AP_MPMQ_MIN_SPARE_DEAMONS: + case AP_MPMQ_MIN_SPARE_DAEMONS: *result = 0; return APR_SUCCESS; case AP_MPMQ_MIN_SPARE_THREADS: @@ -230,7 +230,7 @@ AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result) case AP_MPMQ_MAX_SPARE_THREADS: *result = ap_threads_max_free; return APR_SUCCESS; - case AP_MPMQ_MAX_REQUESTS_DEAMON: + case AP_MPMQ_MAX_REQUESTS_DAEMON: *result = ap_max_requests_per_child; return APR_SUCCESS; case AP_MPMQ_MAX_DAEMONS: diff --git a/server/mpm/perchild/perchild.c b/server/mpm/perchild/perchild.c index 21bb3634b4..f2cb943ee7 100644 --- a/server/mpm/perchild/perchild.c +++ b/server/mpm/perchild/perchild.c @@ -236,7 +236,7 @@ AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result) case AP_MPMQ_MAX_THREADS: *result = max_threads; return APR_SUCCESS; - case AP_MPMQ_MIN_SPARE_DEAMONS: + case AP_MPMQ_MIN_SPARE_DAEMONS: *result = 0; return APR_SUCCESS; case AP_MPMQ_MIN_SPARE_THREADS: @@ -248,7 +248,7 @@ AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result) case AP_MPMQ_MAX_SPARE_THREADS: *result = max_spare_threads; return APR_SUCCESS; - case AP_MPMQ_MAX_REQUESTS_DEAMON: + case AP_MPMQ_MAX_REQUESTS_DAEMON: *result = max_requests_per_child; return APR_SUCCESS; case AP_MPMQ_MAX_DAEMONS: diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c index 070dd86566..82157db185 100644 --- a/server/mpm/prefork/prefork.c +++ b/server/mpm/prefork/prefork.c @@ -314,7 +314,7 @@ AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result) case AP_MPMQ_MAX_THREADS: *result = 0; return APR_SUCCESS; - case AP_MPMQ_MIN_SPARE_DEAMONS: + case AP_MPMQ_MIN_SPARE_DAEMONS: *result = ap_daemons_min_free; return APR_SUCCESS; case AP_MPMQ_MIN_SPARE_THREADS: @@ -326,7 +326,7 @@ AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result) case AP_MPMQ_MAX_SPARE_THREADS: *result = 0; return APR_SUCCESS; - case AP_MPMQ_MAX_REQUESTS_DEAMON: + case AP_MPMQ_MAX_REQUESTS_DAEMON: *result = ap_max_requests_per_child; return APR_SUCCESS; case AP_MPMQ_MAX_DAEMONS: diff --git a/server/mpm/spmt_os2/spmt_os2.c b/server/mpm/spmt_os2/spmt_os2.c index 9f87729a17..3deba5a6b4 100644 --- a/server/mpm/spmt_os2/spmt_os2.c +++ b/server/mpm/spmt_os2/spmt_os2.c @@ -892,7 +892,7 @@ AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result) case AP_MPMQ_MAX_THREADS: *result = ap_threads_per_child; return APR_SUCCESS; - case AP_MPMQ_MIN_SPARE_DEAMONS: + case AP_MPMQ_MIN_SPARE_DAEMONS: *result = 0; return APR_SUCCESS; case AP_MPMQ_MIN_SPARE_THREADS: @@ -904,7 +904,7 @@ AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result) case AP_MPMQ_MAX_SPARE_THREADS: *result = ap_daemons_max_free; return APR_SUCCESS; - case AP_MPMQ_MAX_REQUESTS_DEAMON: + case AP_MPMQ_MAX_REQUESTS_DAEMON: *result = ap_max_requests_per_child; return APR_SUCCESS; case AP_MPMQ_MAX_DAEMONS: diff --git a/server/mpm/threaded/threaded.c b/server/mpm/threaded/threaded.c index a9f6248c25..7818daae9e 100644 --- a/server/mpm/threaded/threaded.c +++ b/server/mpm/threaded/threaded.c @@ -205,7 +205,7 @@ AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result) case AP_MPMQ_MAX_THREADS: *result = ap_threads_per_child; return APR_SUCCESS; - case AP_MPMQ_MIN_SPARE_DEAMONS: + case AP_MPMQ_MIN_SPARE_DAEMONS: *result = 0; return APR_SUCCESS; case AP_MPMQ_MIN_SPARE_THREADS: @@ -217,7 +217,7 @@ AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result) case AP_MPMQ_MAX_SPARE_THREADS: *result = max_spare_threads; return APR_SUCCESS; - case AP_MPMQ_MAX_REQUESTS_DEAMON: + case AP_MPMQ_MAX_REQUESTS_DAEMON: *result = ap_max_requests_per_child; return APR_SUCCESS; case AP_MPMQ_MAX_DAEMONS: diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c index 5d2c448b33..2f25b1ce66 100644 --- a/server/mpm/winnt/mpm_winnt.c +++ b/server/mpm/winnt/mpm_winnt.c @@ -1562,7 +1562,7 @@ AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result) case AP_MPMQ_MAX_THREADS: *result = ap_threads_per_child; return APR_SUCCESS; - case AP_MPMQ_MIN_SPARE_DEAMONS: + case AP_MPMQ_MIN_SPARE_DAEMONS: *result = 0; return APR_SUCCESS; case AP_MPMQ_MIN_SPARE_THREADS: @@ -1574,7 +1574,7 @@ AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result) case AP_MPMQ_MAX_SPARE_THREADS: *result = 0; return APR_SUCCESS; - case AP_MPMQ_MAX_REQUESTS_DEAMON: + case AP_MPMQ_MAX_REQUESTS_DAEMON: *result = ap_max_requests_per_child; return APR_SUCCESS; case AP_MPMQ_MAX_DAEMONS: diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c index f27f4d7258..4e15eaa3e6 100644 --- a/server/mpm/worker/worker.c +++ b/server/mpm/worker/worker.c @@ -229,7 +229,7 @@ AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result) case AP_MPMQ_MAX_THREADS: *result = ap_threads_per_child; return APR_SUCCESS; - case AP_MPMQ_MIN_SPARE_DEAMONS: + case AP_MPMQ_MIN_SPARE_DAEMONS: *result = 0; return APR_SUCCESS; case AP_MPMQ_MIN_SPARE_THREADS: @@ -241,7 +241,7 @@ AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result) case AP_MPMQ_MAX_SPARE_THREADS: *result = max_spare_threads; return APR_SUCCESS; - case AP_MPMQ_MAX_REQUESTS_DEAMON: + case AP_MPMQ_MAX_REQUESTS_DAEMON: *result = ap_max_requests_per_child; return APR_SUCCESS; case AP_MPMQ_MAX_DAEMONS: -- 2.50.1