Commit dd98faa0 authored by Cliff Woolley's avatar Cliff Woolley
Browse files

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
parent d06ab73d

CHANGES

+5 −1
Original line number Diff line number Diff line 
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>]

include/ap_mpm.h

+3 −3
Original line number Diff line number Diff line
@@ -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   */

server/mpm/beos/beos.c

+2 −2
Original line number Diff line number Diff line
@@ -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:

server/mpm/experimental/perchild/perchild.c

+2 −2
Original line number Diff line number Diff line
@@ -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:

server/mpm/mpmt_os2/mpmt_os2.c

+2 −2
Original line number Diff line number Diff line
@@ -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; 

    }