You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by dg...@hyperreal.org on 1998/03/26 19:59:39 UTC
cvs commit: apache-1.2/src CHANGES http_main.c
dgaudet 98/03/26 10:59:39
Modified: src CHANGES http_main.c
Log:
After a SIGHUP the listening sockets in the parent weren't
properly marked for closure on fork().
PR: 2000
Submitted by: J�rgen Keil <jk...@tools.de>
Revision Changes Path
1.302 +4 -0 apache-1.2/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.2/src/CHANGES,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- CHANGES 1998/03/26 18:52:48 1.301
+++ CHANGES 1998/03/26 18:59:36 1.302
@@ -1,5 +1,9 @@
Changes with Apache 1.2.7
+ *) After a SIGHUP the listening sockets in the parent weren't
+ properly marked for closure on fork().
+ [J�rgen Keil <jk...@tools.de>] PR#2000
+
*) Fix an incompatible pointer type assignment warning in buff.c.
[Dean Gaudet] PR#2001
1.152 +3 -0 apache-1.2/src/http_main.c
Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apache-1.2/src/http_main.c,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- http_main.c 1998/02/17 01:45:58 1.151
+++ http_main.c 1998/03/26 18:59:37 1.152
@@ -2255,6 +2255,9 @@
if (fd < 0) {
fd = make_sock (pconf, &lr->local_addr);
}
+ else {
+ note_cleanups_for_fd(pconf, fd);
+ }
FD_SET (fd, &listenfds);
if (fd > listenmaxfd) listenmaxfd = fd;
lr->fd = fd;