httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/perchild perchild.c
Date Fri, 05 Apr 2002 00:34:22 GMT
trawick     02/04/04 16:34:22

  Modified:    .        CHANGES
               server/mpm/beos beos.c
               server/mpm/perchild perchild.c
  Log:
  implement FOREGROUND for perchild and beos MPMs too
  
  Revision  Changes    Path
  1.684     +4 -3      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.683
  retrieving revision 1.684
  diff -u -r1.683 -r1.684
  --- CHANGES	5 Apr 2002 00:18:14 -0000	1.683
  +++ CHANGES	5 Apr 2002 00:34:22 -0000	1.684
  @@ -1,8 +1,9 @@
   Changes with Apache 2.0.35
   
  -  *) worker and prefork MPMs: Add -DFOREGROUND switch to cause the
  -     Apache parent process to run in the foreground (similar to -DNO_DETACH
  -     except that it doesn't switch session ids).  [Jeff Trawick]
  +  *) worker, prefork, perchild, beos MPMs: Add -DFOREGROUND switch to 
  +     cause the Apache parent process to run in the foreground (similar to
  +     -DNO_DETACH except that it doesn't switch session ids).  
  +     [Jeff Trawick]
   
     *) Added support for Posix semaphore mutex locking (AcceptMutex posixsem)
        for those platforms that support it. If using the default
  
  
  
  1.92      +6 -4      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.91
  retrieving revision 1.92
  diff -u -r1.91 -r1.92
  --- beos.c	29 Mar 2002 08:17:25 -0000	1.91
  +++ beos.c	5 Apr 2002 00:34:22 -0000	1.92
  @@ -1000,24 +1000,26 @@
   static int beos_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp)
   {
       static int restart_num = 0;
  -    int no_detach, debug;
  +    int no_detach, debug, foreground;
       apr_status_t rv;
   
       debug = ap_exists_config_define("DEBUG");
   
  -    if (debug)
  -        no_detach = one_process = 1;
  +    if (debug) {
  +        foreground = one_process = 1;
  +    }
       else
       {
           one_process = ap_exists_config_define("ONE_PROCESS");
           no_detach = ap_exists_config_define("NO_DETACH");
  +        foreground = ap_exists_config_define("FOREGROUND");
       }
   
       /* sigh, want this only the second time around */
       if (restart_num++ == 1) {
           is_graceful = 0;
           
  -        if (!one_process) {
  +        if (!one_process && !foreground) {
               rv = apr_proc_detach(no_detach ? APR_PROC_DETACH_FOREGROUND
                                              : APR_PROC_DETACH_DAEMONIZE);
               if (rv != APR_SUCCESS) {
  
  
  
  1.121     +4 -3      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.120
  retrieving revision 1.121
  diff -u -r1.120 -r1.121
  --- perchild.c	1 Apr 2002 08:27:42 -0000	1.120
  +++ perchild.c	5 Apr 2002 00:34:22 -0000	1.121
  @@ -1454,7 +1454,7 @@
   static int perchild_pre_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp)
   {
       static int restart_num = 0;
  -    int no_detach, debug;
  +    int no_detach, debug, foreground;
       ap_directive_t *pdir;
       int i;
       int tmp_server_limit = DEFAULT_SERVER_LIMIT;
  @@ -1464,18 +1464,19 @@
       debug = ap_exists_config_define("DEBUG");
   
       if (debug) {
  -        no_detach = one_process = 1;
  +        foreground = one_process = 1;
       }
       else {
           one_process = ap_exists_config_define("ONE_PROCESS");
           no_detach = ap_exists_config_define("NO_DETACH");
  +        foreground = ap_exists_config_define("FOREGROUND");
       }
   
       /* sigh, want this only the second time around */
       if (restart_num++ == 1) {
           is_graceful = 0;
   
  -        if (!one_process) {
  +        if (!one_process && !foreground) {
               rv = apr_proc_detach(no_detach ? APR_PROC_DETACH_FOREGROUND
                                              : APR_PROC_DETACH_DAEMONIZE);
               if (rv != APR_SUCCESS) {
  
  
  

Mime
View raw message