dgaudet 98/03/27 12:18:52
Modified: src CHANGES src/main http_main.c Log: SIGXCPU and SIGXFSZ are now reset to SIG_DFL at boot-time. This is necessary on at least Solaris where the /etc/rc?.d scripts are run with these signals ignored, and "SIG_IGN" settings are maintained across exec(). PR: 2009 Submitted by: Rein Tollevik <[EMAIL PROTECTED]> Revision Changes Path 1.740 +6 -0 apache-1.3/src/CHANGES Index: CHANGES =================================================================== RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.739 retrieving revision 1.740 diff -u -r1.739 -r1.740 --- CHANGES 1998/03/27 17:37:31 1.739 +++ CHANGES 1998/03/27 20:18:46 1.740 @@ -1,5 +1,11 @@ Changes with Apache 1.3b6 + *) SIGXCPU and SIGXFSZ are now reset to SIG_DFL at boot-time. This + is necessary on at least Solaris where the /etc/rc?.d scripts + are run with these signals ignored, and "SIG_IGN" settings are + maintained across exec(). + [Rein Tollevik <[EMAIL PROTECTED]>] PR#2009 + *) Fix the check for symbolic links in ``RewriteCond ... -l'': stat() was used instead of lstat() and thus this flag didn't work as expected. [Rein Tollevik <[EMAIL PROTECTED]>, PR#2010] 1.315 +16 -0 apache-1.3/src/main/http_main.c Index: http_main.c =================================================================== RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v retrieving revision 1.314 retrieving revision 1.315 diff -u -r1.314 -r1.315 --- http_main.c 1998/03/27 08:51:39 1.314 +++ http_main.c 1998/03/27 20:18:50 1.315 @@ -2349,6 +2349,16 @@ if (sigaction(SIGINT, &sa, NULL) < 0) aplog_error(APLOG_MARK, APLOG_WARNING, server_conf, "sigaction(SIGINT)"); #endif +#ifdef SIGXCPU + sa.sa_handler = SIG_DFL; + if (sigaction(SIGXCPU, &sa, NULL) < 0) + aplog_error(APLOG_MARK, APLOG_WARNING, server_conf, "sigaction(SIGXCPU)"); +#endif +#ifdef SIGXFSZ + sa.sa_handler = SIG_DFL; + if (sigaction(SIGXFSZ, &sa, NULL) < 0) + aplog_error(APLOG_MARK, APLOG_WARNING, server_conf, "sigaction(SIGXFSZ)"); +#endif /* we want to ignore HUPs and USR1 while we're busy processing one */ sigaddset(&sa.sa_mask, SIGHUP); @@ -2370,6 +2380,12 @@ #ifdef SIGABRT signal(SIGABRT, sig_coredump); #endif /* SIGABRT */ +#ifdef SIGXCPU + signal(SIGXCPU, SIG_DFL); +#endif /* SIGXCPU */ +#ifdef SIGXFSZ + signal(SIGXFSZ, SIG_DFL); +#endif /* SIGXFSZ */ } signal(SIGTERM, sig_term);