manoj 99/02/17 21:39:53
Modified: pthreads/src/main http_main.c
Log:
During graceful restart we close our listeners to kick our threads out of
accept(), we seem to be missing the first file descriptor, probably because
of an errant cut-and-paste.
I think this bug didn't show up on Linux because in the single port case,
the only thread doing the accept is the "parent" thread, which is
guaranteed to be hit by a signal and interrupted.
Revision Changes Path
1.44 +2 -2 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.43
retrieving revision 1.44
diff -u -u -r1.43 -r1.44
--- http_main.c 1999/02/17 22:39:43 1.43
+++ http_main.c 1999/02/18 05:39:52 1.44
@@ -418,10 +418,10 @@
pthread_cond_broadcast(&(csd_queue.not_empty));
- /* Setup acceptor threads */
+ /* Kick acceptor threads out of accept */
lr = ap_listeners;
- while (lr->next != NULL) {
+ while (lr != NULL) {
ap_pclosesocket(pconf, lr->fd);
lr= lr->next;
}
