httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@hyperreal.org
Subject cvs commit: apache-apr/pthreads/src/modules/standard mod_so.c
Date Tue, 16 Mar 1999 22:07:58 GMT
manoj       99/03/16 14:07:58

  Modified:    pthreads/src/main http_config.c http_log.c http_main.c
                        http_protocol.c
               pthreads/src/modules/standard mod_so.c
  Log:
  More SIGUSR1 -> SIGWINCH fixes. This should fix every mention of USR1
  for restarts except for the documentation.
  
  Revision  Changes    Path
  1.10      +2 -7      apache-apr/pthreads/src/main/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/pthreads/src/main/http_config.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -u -r1.9 -r1.10
  --- http_config.c	1999/02/16 16:00:48	1.9
  +++ http_config.c	1999/03/16 22:07:55	1.10
  @@ -1523,14 +1523,9 @@
   #ifdef SIGHUP
       signal(SIGHUP, SIG_IGN);
   #endif
  -    /* XXX - LinuxThreads uses SIGUSR1, so we can't muck with it. Bummer. We
  -     * need to find another way to do graceful restarts if we want to support
  -     * kernel threads with Linux 2.0 (2.2 is supposed to fix this) - mvsk */
  -#ifndef LINUX
  -#ifdef SIGUSR1
  -    signal(SIGUSR1, SIG_IGN);
  +#ifdef SIGWINCH
  +    signal(SIGWINCH, SIG_IGN);
   #endif
  -#endif /* ndef LINUX */
   
       for (m = top_module; m; m = m->next)
   	if (m->child_exit)
  
  
  
  1.3       +1 -1      apache-apr/pthreads/src/main/http_log.c
  
  Index: http_log.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/pthreads/src/main/http_log.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -u -r1.2 -r1.3
  --- http_log.c	1999/02/07 06:29:30	1.2
  +++ http_log.c	1999/03/16 22:07:55	1.3
  @@ -482,7 +482,7 @@
       fname = ap_server_root_relative(p, fname);
       mypid = getpid();
       if (mypid != saved_pid && stat(fname, &finfo) == 0) {
  -      /* USR1 and HUP call this on each restart.
  +      /* WINCH and HUP call this on each restart.
          * Only warn on first time through for this pid.
          *
          * XXX: Could just write first time through too, although
  
  
  
  1.60      +0 -7      apache-apr/pthreads/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/pthreads/src/main/http_main.c,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -u -r1.59 -r1.60
  --- http_main.c	1999/03/16 21:26:26	1.59
  +++ http_main.c	1999/03/16 22:07:55	1.60
  @@ -2079,13 +2079,6 @@
   
       /* All threads should mask signals out, accoring to sigwait(2) man page */
       sigemptyset(&sig_mask);
  -    /* Linux 2.0 and its annoying use of SIGUSR{1,2} */
  -#ifdef LINUX
  -    /*
  -    sigaddset(&sig_mask, SIGUSR1);
  -    sigaddset(&sig_mask, SIGUSR2);
  -    */
  -#endif
   
       if (pthread_sigmask(SIG_SETMASK, &sig_mask, NULL) != 0) {
           ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf, "pthread_sigmask");
  
  
  
  1.10      +2 -7      apache-apr/pthreads/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/pthreads/src/main/http_protocol.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -u -r1.9 -r1.10
  --- http_protocol.c	1999/03/15 14:26:50	1.9
  +++ http_protocol.c	1999/03/16 22:07:55	1.10
  @@ -789,14 +789,9 @@
       }
       /* we've probably got something to do, ignore graceful restart requests */
   
  -    /* XXX - LinuxThreads uses SIGUSR1, so we can't muck with it. Bummer. We
  -     * need to find another way to do graceful restarts if we want to support
  -     * kernel threads with Linux 2.0 (2.2 is supposed to fix this) - mvsk */
  -#ifndef LINUX
  -#ifdef SIGUSR1
  -    signal(SIGUSR1, SIG_IGN);
  +#ifdef SIGWINCH
  +    signal(SIGWINCH, SIG_IGN);
   #endif
  -#endif /* ndef LINUX */
   
       ap_bsetflag(conn->client, B_SAFEREAD, 0);
   
  
  
  
  1.3       +2 -2      apache-apr/pthreads/src/modules/standard/mod_so.c
  
  Index: mod_so.c
  ===================================================================
  RCS file: /home/cvs/apache-apr/pthreads/src/modules/standard/mod_so.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -u -r1.2 -r1.3
  --- mod_so.c	1999/02/07 06:29:55	1.2
  +++ mod_so.c	1999/03/16 22:07:58	1.3
  @@ -58,7 +58,7 @@
   /* 
    * This module is used to load Apache modules at runtime. This means that the
    * server functionality can be extended without recompiling and even without
  - * taking the server down at all. Only a HUP or USR1 signal needs to be send
  + * taking the server down at all. Only a HUP or WINCH signal needs to be send
    * to the server to reload the dynamically loaded modules.
    *
    * To use, you'll first need to build your module as a shared library, then
  @@ -97,7 +97,7 @@
    * directive to get these log messages).
    *
    * If you edit the LoadModule directives while the server is live you can get
  - * Apache to re-load the modules by sending it a HUP or USR1 signal as normal.
  + * Apache to re-load the modules by sending it a HUP or WINCH signal as normal.
    * You can use this to dynamically change the capability of your server
    * without bringing it down.
    *
  
  
  

Mime
View raw message