dgaudet 97/06/27 01:13:15
Modified: src http_main.c Log: bogus comments corrected Revision Changes Path 1.161 +4 -6 apache/src/http_main.c Index: http_main.c =================================================================== RCS file: /export/home/cvs/apache/src/http_main.c,v retrieving revision 1.160 retrieving revision 1.161 diff -C3 -r1.160 -r1.161 *** http_main.c 1997/06/24 18:15:19 1.160 --- http_main.c 1997/06/27 08:13:14 1.161 *************** *** 1474,1486 **** log_unixerr ("sigaction(SIGTERM)", NULL, NULL, server_conf); /* wait_or_timeout uses sleep() which could deliver a SIGALRM just as we're ! * trying to process the restart requests. That's not good. restart ! * cleans out the SIGALRM handler, but this totally avoids the race ! * condition between when the restart request is made and when the handler ! * is invoked. * ! * We also don't want to ignore HUPs and USR1 while we're busy processing ! * one. */ sigaddset (&sa.sa_mask, SIGALRM); sigaddset (&sa.sa_mask, SIGHUP); --- 1474,1484 ---- log_unixerr ("sigaction(SIGTERM)", NULL, NULL, server_conf); /* wait_or_timeout uses sleep() which could deliver a SIGALRM just as we're ! * trying to process the restart requests. That's not good. So we avoid ! * the race condition between when the restart request is made and when the ! * handler is invoked. * ! * We also want to ignore HUPs and USR1 while we're busy processing one. */ sigaddset (&sa.sa_mask, SIGALRM); sigaddset (&sa.sa_mask, SIGHUP);