httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwool...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/worker worker.c
Date Wed, 07 Nov 2001 05:29:58 GMT
jwoolley    01/11/06 21:29:58

  Modified:    .        CHANGES
               include  ap_mpm.h
               server/mpm/beos beos.c
               server/mpm/mpmt_os2 mpmt_os2.c
               server/mpm/netware mpm_netware.c
               server/mpm/perchild perchild.c
               server/mpm/prefork prefork.c
               server/mpm/spmt_os2 spmt_os2.c
               server/mpm/threaded threaded.c
               server/mpm/winnt mpm_winnt.c
               server/mpm/worker worker.c
  Log:
  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.
  
  Revision  Changes    Path
  1.418     +5 -1      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.417
  retrieving revision 1.418
  diff -u -d -u -r1.417 -r1.418
  --- CHANGES	2001/11/06 16:52:59	1.417
  +++ CHANGES	2001/11/07 05:29:57	1.418
  @@ -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 <mturk@mappingsoft.com>]
   
  
  
  
  1.30      +3 -3      httpd-2.0/include/ap_mpm.h
  
  Index: ap_mpm.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/ap_mpm.h,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -d -u -r1.29 -r1.30
  --- ap_mpm.h	2001/08/15 21:11:57	1.29
  +++ ap_mpm.h	2001/11/07 05:29:57	1.30
  @@ -161,14 +161,14 @@
   #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   */
   
   
  
  
  
  1.64      +2 -2      httpd-2.0/server/mpm/beos/beos.c
  
  Index: beos.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/beos/beos.c,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -d -u -r1.63 -r1.64
  --- beos.c	2001/10/23 17:30:07	1.63
  +++ beos.c	2001/11/07 05:29:58	1.64
  @@ -688,7 +688,7 @@
           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 @@
           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:
  
  
  
  1.7       +2 -2      httpd-2.0/server/mpm/mpmt_os2/mpmt_os2.c
  
  Index: mpmt_os2.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/mpmt_os2/mpmt_os2.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -d -u -r1.6 -r1.7
  --- mpmt_os2.c	2001/08/30 20:50:05	1.6
  +++ mpmt_os2.c	2001/11/07 05:29:58	1.7
  @@ -457,13 +457,13 @@
           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; 
       }
  
  
  
  1.6       +2 -2      httpd-2.0/server/mpm/netware/mpm_netware.c
  
  Index: mpm_netware.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/netware/mpm_netware.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -d -u -r1.5 -r1.6
  --- mpm_netware.c	2001/11/02 18:07:17	1.5
  +++ mpm_netware.c	2001/11/07 05:29:58	1.6
  @@ -218,7 +218,7 @@
           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 @@
           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:
  
  
  
  1.81      +2 -2      httpd-2.0/server/mpm/perchild/perchild.c
  
  Index: perchild.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/perchild/perchild.c,v
  retrieving revision 1.80
  retrieving revision 1.81
  diff -u -d -u -r1.80 -r1.81
  --- perchild.c	2001/10/23 17:30:07	1.80
  +++ perchild.c	2001/11/07 05:29:58	1.81
  @@ -236,7 +236,7 @@
           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 @@
           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:
  
  
  
  1.207     +2 -2      httpd-2.0/server/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/prefork.c,v
  retrieving revision 1.206
  retrieving revision 1.207
  diff -u -d -u -r1.206 -r1.207
  --- prefork.c	2001/11/06 03:43:19	1.206
  +++ prefork.c	2001/11/07 05:29:58	1.207
  @@ -314,7 +314,7 @@
           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 @@
           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:
  
  
  
  1.104     +2 -2      httpd-2.0/server/mpm/spmt_os2/spmt_os2.c
  
  Index: spmt_os2.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/spmt_os2/spmt_os2.c,v
  retrieving revision 1.103
  retrieving revision 1.104
  diff -u -d -u -r1.103 -r1.104
  --- spmt_os2.c	2001/08/30 20:50:06	1.103
  +++ spmt_os2.c	2001/11/07 05:29:58	1.104
  @@ -892,7 +892,7 @@
           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 @@
           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:
  
  
  
  1.67      +2 -2      httpd-2.0/server/mpm/threaded/threaded.c
  
  Index: threaded.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/threaded/threaded.c,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -d -u -r1.66 -r1.67
  --- threaded.c	2001/10/23 17:30:07	1.66
  +++ threaded.c	2001/11/07 05:29:58	1.67
  @@ -205,7 +205,7 @@
           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 @@
           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:
  
  
  
  1.187     +2 -2      httpd-2.0/server/mpm/winnt/mpm_winnt.c
  
  Index: mpm_winnt.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/mpm_winnt.c,v
  retrieving revision 1.186
  retrieving revision 1.187
  diff -u -d -u -r1.186 -r1.187
  --- mpm_winnt.c	2001/10/23 17:13:26	1.186
  +++ mpm_winnt.c	2001/11/07 05:29:58	1.187
  @@ -1562,7 +1562,7 @@
           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 @@
           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:
  
  
  
  1.32      +2 -2      httpd-2.0/server/mpm/worker/worker.c
  
  Index: worker.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/worker/worker.c,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -d -u -r1.31 -r1.32
  --- worker.c	2001/10/23 17:30:07	1.31
  +++ worker.c	2001/11/07 05:29:58	1.32
  @@ -229,7 +229,7 @@
           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 @@
           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:
  
  
  

Mime
View raw message