You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ma...@hyperreal.org on 1999/07/19 02:59:38 UTC
cvs commit: apache-apr/pthreads/src/main acceptlock.c http_accept.c http_config.c http_protocol.c
manoj 99/07/18 17:59:37
Modified: pthreads/src/main acceptlock.c http_accept.c http_config.c
http_protocol.c
Log:
Some cleanup of signal handling. There were some stray bits of code that
weren't cleaned up in the switchover to the pipe of death.
Revision Changes Path
1.12 +0 -2 apache-apr/pthreads/src/main/acceptlock.c
Index: acceptlock.c
===================================================================
RCS file: /home/cvs/apache-apr/pthreads/src/main/acceptlock.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -u -r1.11 -r1.12
--- acceptlock.c 1999/06/23 19:13:00 1.11
+++ acceptlock.c 1999/07/19 00:59:32 1.12
@@ -308,9 +308,7 @@
}
#ifdef NEED_TO_BLOCK_SIGNALS_AROUND_PTHREAD_CALLS
sigfillset(&accept_block_mask);
- sigdelset(&accept_block_mask, SIGHUP);
sigdelset(&accept_block_mask, SIGTERM);
- sigdelset(&accept_block_mask, SIGWINCH);
#endif
ap_register_cleanup(p, NULL, accept_mutex_cleanup, ap_null_cleanup);
}
1.21 +1 -1 apache-apr/pthreads/src/main/http_accept.c
Index: http_accept.c
===================================================================
RCS file: /home/cvs/apache-apr/pthreads/src/main/http_accept.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -u -r1.20 -r1.21
--- http_accept.c 1999/06/30 19:01:06 1.20
+++ http_accept.c 1999/07/19 00:59:33 1.21
@@ -66,7 +66,7 @@
#include <poll.h>
#include <netinet/tcp.h>
-/* Indicates that all acceptor threads are dead after SIGWINCH and the worker
+/* Indicates that all acceptor threads are dead and the worker
* threads can now exit */
static int workers_may_exit = 0;
static int requests_this_child;
1.14 +0 -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.13
retrieving revision 1.14
diff -u -d -u -r1.13 -r1.14
--- http_config.c 1999/06/10 06:26:07 1.13
+++ http_config.c 1999/07/19 00:59:33 1.14
@@ -1524,13 +1524,6 @@
{
module *m;
-#ifdef SIGHUP
- signal(SIGHUP, SIG_IGN);
-#endif
-#ifdef SIGWINCH
- signal(SIGWINCH, SIG_IGN);
-#endif
-
for (m = top_module; m; m = m->next)
if (m->child_exit)
(*m->child_exit) (s, p);
1.19 +0 -11 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.18
retrieving revision 1.19
diff -u -d -u -r1.18 -r1.19
--- http_protocol.c 1999/06/10 06:26:09 1.18
+++ http_protocol.c 1999/07/19 00:59:33 1.19
@@ -810,17 +810,6 @@
}
/* we've probably got something to do, ignore graceful restart requests */
- /* XXX - sigwait doesn't work if the signal has been SIG_IGNed (under
- * linux 2.0 w/ glibc 2.0, anyway), and this step isn't necessary when
- * we're running a sigwait thread anyway. If/when unthreaded mode is
- * put back in, we should make sure to ignore this signal iff a sigwait
- * thread isn't used. - mvsk
-
-#ifdef SIGWINCH
- signal(SIGWINCH, SIG_IGN);
-#endif
- */
-
ap_bsetflag(conn->client, B_SAFEREAD, 0);
r->request_time = time(NULL);