httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/mpm/prefork prefork.c
Date Wed, 05 Apr 2000 01:23:51 GMT
trawick     00/04/04 18:23:51

  Modified:    src/main http_protocol.c http_log.c
               src/modules/mpm/dexter dexter.c
               src/modules/mpm/mpmt_pthread mpmt_pthread.c
               src/modules/mpm/prefork prefork.c
  Log:
  stop relying on a macro to map signal() to ap_signal(); call
  ap_signal() directly
  
  Revision  Changes    Path
  1.60      +1 -1      apache-2.0/src/main/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- http_protocol.c	2000/03/31 08:44:20	1.59
  +++ http_protocol.c	2000/04/05 01:23:49	1.60
  @@ -855,7 +855,7 @@
        * thread isn't used. - mvsk
   
   #ifdef SIGWINCH
  -    signal(SIGWINCH, SIG_IGN);
  +    ap_signal(SIGWINCH, SIG_IGN);
   #endif
       */
   
  
  
  
  1.38      +2 -2      apache-2.0/src/main/http_log.c
  
  Index: http_log.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_log.c,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- http_log.c	2000/04/03 18:40:44	1.37
  +++ http_log.c	2000/04/05 01:23:49	1.38
  @@ -175,7 +175,7 @@
   
   #ifdef SIGHUP
       /* No concept of a child process on Win32 */
  -    signal(SIGHUP, SIG_IGN);
  +    ap_signal(SIGHUP, SIG_IGN);
   #endif /* ndef SIGHUP */
   
       if ((ap_createprocattr_init(&procattr, p) != APR_SUCCESS) ||
  @@ -585,7 +585,7 @@
   
       ap_cleanup_for_exec();
   #ifdef SIGHUP
  -    signal(SIGHUP, SIG_IGN);
  +    ap_signal(SIGHUP, SIG_IGN);
   #endif
       if ((ap_createprocattr_init(&procattr, pl->p)         != APR_SUCCESS) ||
           (ap_setprocattr_dir(procattr, pl->program)        != APR_SUCCESS) ||
  
  
  
  1.68      +14 -14    apache-2.0/src/modules/mpm/dexter/dexter.c
  
  Index: dexter.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.c,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- dexter.c	2000/04/04 22:36:59	1.67
  +++ dexter.c	2000/04/05 01:23:50	1.68
  @@ -304,7 +304,7 @@
   static void sig_coredump(int sig)
   {
       chdir(ap_coredump_dir);
  -    signal(sig, SIG_DFL);
  +    ap_signal(sig, SIG_DFL);
       kill(getpid(), sig);
       /* At this point we've got sig blocked, because we're still inside
        * the signal handler.  When we leave the signal handler it will
  @@ -454,36 +454,36 @@
   	ap_log_error(APLOG_MARK, APLOG_WARNING, errno, server_conf, "sigaction(SIGWINCH)");
   #else
       if (!one_process) {
  -	signal(SIGSEGV, sig_coredump);
  +	ap_signal(SIGSEGV, sig_coredump);
   #ifdef SIGBUS
  -	signal(SIGBUS, sig_coredump);
  +	ap_signal(SIGBUS, sig_coredump);
   #endif /* SIGBUS */
   #ifdef SIGABORT
  -	signal(SIGABORT, sig_coredump);
  +	ap_signal(SIGABORT, sig_coredump);
   #endif /* SIGABORT */
   #ifdef SIGABRT
  -	signal(SIGABRT, sig_coredump);
  +	ap_signal(SIGABRT, sig_coredump);
   #endif /* SIGABRT */
   #ifdef SIGILL
  -	signal(SIGILL, sig_coredump);
  +	ap_signal(SIGILL, sig_coredump);
   #endif /* SIGILL */
   #ifdef SIGXCPU
  -	signal(SIGXCPU, SIG_DFL);
  +	ap_signal(SIGXCPU, SIG_DFL);
   #endif /* SIGXCPU */
   #ifdef SIGXFSZ
  -	signal(SIGXFSZ, SIG_DFL);
  +	ap_signal(SIGXFSZ, SIG_DFL);
   #endif /* SIGXFSZ */
       }
   
  -    signal(SIGTERM, sig_term);
  +    ap_signal(SIGTERM, sig_term);
   #ifdef SIGHUP
  -    signal(SIGHUP, restart);
  +    ap_signal(SIGHUP, restart);
   #endif /* SIGHUP */
   #ifdef SIGWINCH
  -    signal(SIGWINCH, restart);
  +    ap_signal(SIGWINCH, restart);
   #endif /* SIGWINCH */
   #ifdef SIGPIPE
  -    signal(SIGPIPE, SIG_IGN);
  +    ap_signal(SIGPIPE, SIG_IGN);
   #endif /* SIGPIPE */
   
   #endif
  @@ -983,7 +983,7 @@
           RAISE_SIGSTOP(MAKE_CHILD);
   
   	/* XXX - For an unthreaded server, a signal handler will be necessary
  -        signal(SIGTERM, just_die);
  +        ap_signal(SIGTERM, just_die);
   	*/
           child_main(slot);
   
  @@ -1269,7 +1269,7 @@
       }
   
       /* we've been told to restart */
  -    signal(SIGHUP, SIG_IGN);
  +    ap_signal(SIGHUP, SIG_IGN);
   
       if (one_process) {
   	/* not worth thinking about */
  
  
  
  1.61      +14 -14    apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c
  
  Index: mpmt_pthread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- mpmt_pthread.c	2000/04/04 22:37:00	1.60
  +++ mpmt_pthread.c	2000/04/05 01:23:50	1.61
  @@ -298,7 +298,7 @@
   static void sig_coredump(int sig)
   {
       chdir(ap_coredump_dir);
  -    signal(sig, SIG_DFL);
  +    ap_signal(sig, SIG_DFL);
       kill(my_pid, sig);
       /* At this point we've got sig blocked, because we're still inside
        * the signal handler.  When we leave the signal handler it will
  @@ -449,36 +449,36 @@
   	ap_log_error(APLOG_MARK, APLOG_WARNING, errno, server_conf, "sigaction(SIGWINCH)");
   #else
       if (!one_process) {
  -	signal(SIGSEGV, sig_coredump);
  +	ap_signal(SIGSEGV, sig_coredump);
   #ifdef SIGBUS
  -	signal(SIGBUS, sig_coredump);
  +	ap_signal(SIGBUS, sig_coredump);
   #endif /* SIGBUS */
   #ifdef SIGABORT
  -	signal(SIGABORT, sig_coredump);
  +	ap_signal(SIGABORT, sig_coredump);
   #endif /* SIGABORT */
   #ifdef SIGABRT
  -	signal(SIGABRT, sig_coredump);
  +	ap_signal(SIGABRT, sig_coredump);
   #endif /* SIGABRT */
   #ifdef SIGILL
  -	signal(SIGILL, sig_coredump);
  +	ap_signal(SIGILL, sig_coredump);
   #endif /* SIGILL */
   #ifdef SIGXCPU
  -	signal(SIGXCPU, SIG_DFL);
  +	ap_signal(SIGXCPU, SIG_DFL);
   #endif /* SIGXCPU */
   #ifdef SIGXFSZ
  -	signal(SIGXFSZ, SIG_DFL);
  +	ap_signal(SIGXFSZ, SIG_DFL);
   #endif /* SIGXFSZ */
       }
   
  -    signal(SIGTERM, sig_term);
  +    ap_signal(SIGTERM, sig_term);
   #ifdef SIGHUP
  -    signal(SIGHUP, restart);
  +    ap_signal(SIGHUP, restart);
   #endif /* SIGHUP */
   #ifdef SIGWINCH
  -    signal(SIGWINCH, restart);
  +    ap_signal(SIGWINCH, restart);
   #endif /* SIGWINCH */
   #ifdef SIGPIPE
  -    signal(SIGPIPE, SIG_IGN);
  +    ap_signal(SIGPIPE, SIG_IGN);
   #endif /* SIGPIPE */
   
   #endif
  @@ -952,7 +952,7 @@
   
           RAISE_SIGSTOP(MAKE_CHILD);
   
  -        signal(SIGTERM, just_die);
  +        ap_signal(SIGTERM, just_die);
           child_main(slot);
   
   	return 0;
  @@ -1279,7 +1279,7 @@
       }
   
       /* we've been told to restart */
  -    signal(SIGHUP, SIG_IGN);
  +    ap_signal(SIGHUP, SIG_IGN);
   
       if (one_process) {
   	/* not worth thinking about */
  
  
  
  1.75      +25 -25    apache-2.0/src/modules/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/prefork.c,v
  retrieving revision 1.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- prefork.c	2000/04/04 22:37:00	1.74
  +++ prefork.c	2000/04/05 01:23:51	1.75
  @@ -1182,7 +1182,7 @@
   static void sig_coredump(int sig)
   {
       chdir(ap_coredump_dir);
  -    signal(sig, SIG_DFL);
  +    ap_signal(sig, SIG_DFL);
       kill(getpid(), sig);
       /* At this point we've got sig blocked, because we're still inside
        * the signal handler.  When we leave the signal handler it will
  @@ -1311,36 +1311,36 @@
   	ap_log_error(APLOG_MARK, APLOG_WARNING, errno, server_conf, "sigaction(SIGUSR1)");
   #else
       if (!one_process) {
  -	signal(SIGSEGV, sig_coredump);
  +	ap_signal(SIGSEGV, sig_coredump);
   #ifdef SIGBUS
  -	signal(SIGBUS, sig_coredump);
  +	ap_signal(SIGBUS, sig_coredump);
   #endif /* SIGBUS */
   #ifdef SIGABORT
  -	signal(SIGABORT, sig_coredump);
  +	ap_signal(SIGABORT, sig_coredump);
   #endif /* SIGABORT */
   #ifdef SIGABRT
  -	signal(SIGABRT, sig_coredump);
  +	ap_signal(SIGABRT, sig_coredump);
   #endif /* SIGABRT */
   #ifdef SIGILL
  -	signal(SIGILL, sig_coredump);
  +	ap_signal(SIGILL, sig_coredump);
   #endif /* SIGILL */
   #ifdef SIGXCPU
  -	signal(SIGXCPU, SIG_DFL);
  +	ap_signal(SIGXCPU, SIG_DFL);
   #endif /* SIGXCPU */
   #ifdef SIGXFSZ
  -	signal(SIGXFSZ, SIG_DFL);
  +	ap_signal(SIGXFSZ, SIG_DFL);
   #endif /* SIGXFSZ */
       }
   
  -    signal(SIGTERM, sig_term);
  +    ap_signal(SIGTERM, sig_term);
   #ifdef SIGHUP
  -    signal(SIGHUP, restart);
  +    ap_signal(SIGHUP, restart);
   #endif /* SIGHUP */
   #ifdef SIGUSR1
  -    signal(SIGUSR1, restart);
  +    ap_signal(SIGUSR1, restart);
   #endif /* SIGUSR1 */
   #ifdef SIGPIPE
  -    signal(SIGPIPE, SIG_IGN);
  +    ap_signal(SIGPIPE, SIG_IGN);
   #endif /* SIGPIPE */
   
   #endif
  @@ -1436,8 +1436,8 @@
   
       (void) ap_update_child_status(my_child_num, SERVER_READY, (request_rec *) NULL);
   
  -    signal(SIGHUP, just_die);
  -    signal(SIGTERM, just_die);
  +    ap_signal(SIGHUP, just_die);
  +    ap_signal(SIGTERM, just_die);
   
   #ifdef OS2
   /* Stop Ctrl-C/Ctrl-Break signals going to child processes */
  @@ -1454,7 +1454,7 @@
   	 * we can exit cleanly.
   	 */
   	usr1_just_die = 1;
  -	signal(SIGUSR1, usr1_handler);
  +	ap_signal(SIGUSR1, usr1_handler);
   
   	/*
   	 * (Re)initialize this child to a pre-connection state.
  @@ -1662,7 +1662,7 @@
   	 * the signal to ignore because we don't want to disturb any
   	 * third party code.
   	 */
  -	signal(SIGUSR1, SIG_IGN);
  +	ap_signal(SIGUSR1, SIG_IGN);
   	/*
   	 * We now have a connection, so set it up with the appropriate
   	 * socket options, file descriptors, and read/write buffers.
  @@ -1719,12 +1719,12 @@
       }
   
       if (one_process) {
  -	signal(SIGHUP, just_die);
  -	signal(SIGINT, just_die);
  +	ap_signal(SIGHUP, just_die);
  +	ap_signal(SIGINT, just_die);
   #ifdef SIGQUIT
  -	signal(SIGQUIT, SIG_DFL);
  +	ap_signal(SIGQUIT, SIG_DFL);
   #endif
  -	signal(SIGTERM, just_die);
  +	ap_signal(SIGTERM, just_die);
   	child_main(slot);
       }
   
  @@ -1772,9 +1772,9 @@
   	 * Note that since restart() just notes that a restart has been
   	 * requested there's no race condition here.
   	 */
  -	signal(SIGHUP, just_die);
  -	signal(SIGUSR1, just_die);
  -	signal(SIGTERM, just_die);
  +	ap_signal(SIGHUP, just_die);
  +	ap_signal(SIGUSR1, just_die);
  +	ap_signal(SIGTERM, just_die);
   	child_main(slot);
       }
   
  @@ -2190,8 +2190,8 @@
       }
   
       /* we've been told to restart */
  -    signal(SIGHUP, SIG_IGN);
  -    signal(SIGUSR1, SIG_IGN);
  +    ap_signal(SIGHUP, SIG_IGN);
  +    ap_signal(SIGUSR1, SIG_IGN);
       if (one_process) {
   	/* not worth thinking about */
   	return 1;
  
  
  

Mime
View raw message