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 <mturk@mappingsoft.com>]
#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 */
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:
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:
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:
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:
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;
}
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:
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:
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:
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:
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:
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:
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:
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:
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:
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:
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:
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:
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:
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:
projects / apache / commitdiff