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/prefork prefork.c
Date Thu, 14 Jun 2001 15:46:48 GMT
trawick     01/06/14 08:46:48

  Modified:    server/mpm/prefork prefork.c
  Log:
  fix some more signalling issues:
  
  . in ONE_PROCESS mode, bail out immediately for SIGHUP and
    SIGINT
  
    Note that if you send HUP or INT and have cgid then cgid won't
    go away.  If you generate the interrupt signal from the httpd
    terminal then cgid will go away, [I guess] because SIGINT gets sent
    to the process group.  Perhaps just_die() needs to have logic to
    send to other processes in the group for ONE_PROCES mode
  
  . the die_now flag should be static
  
  . please_die_gracefully() is no longer needed
  
  Revision  Changes    Path
  1.185     +4 -9      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.184
  retrieving revision 1.185
  diff -u -r1.184 -r1.185
  --- prefork.c	2001/06/14 15:26:48	1.184
  +++ prefork.c	2001/06/14 15:46:44	1.185
  @@ -187,7 +187,7 @@
   char tpf_server_name[INETD_SERVNAME_LENGTH+1];
   #endif /* TPF */
   
  -int die_now = 0;
  +static int die_now = 0;
   
   #ifdef GPROF
   /* 
  @@ -382,12 +382,6 @@
       clean_child_exit(0);
   }
   
  -static void please_die_gracefully(int sig)
  -{
  -    /* clean_child_exit(0); */
  -    die_now = 1;
  -}
  -
   /* volatile just in case */
   static int volatile shutdown_pending;
   static int volatile restart_pending;
  @@ -830,8 +824,9 @@
       }
   
       if (one_process) {
  -	apr_signal(SIGHUP, please_die_gracefully);
  -	apr_signal(SIGINT, please_die_gracefully);
  +	apr_signal(SIGHUP, just_die);
  +        /* Don't catch SIGWINCH in ONE_PROCESS mode :) */
  +	apr_signal(SIGINT, just_die);
   #ifdef SIGQUIT
   	apr_signal(SIGQUIT, SIG_DFL);
   #endif
  
  
  

Mime
View raw message