dgaudet 98/03/26 11:03:04
Modified: src CHANGES
src/main 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 <[EMAIL PROTECTED]>
Revision Changes Path
1.733 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.732
retrieving revision 1.733
diff -u -r1.732 -r1.733
--- CHANGES 1998/03/26 13:54:39 1.732
+++ CHANGES 1998/03/26 19:02:59 1.733
@@ -1,4 +1,8 @@
Changes with Apache 1.3b6
+
+ *) After a SIGHUP the listening sockets in the parent weren't
+ properly marked for closure on fork().
+ [Jürgen Keil <[EMAIL PROTECTED]>] PR#2000
*) Allow %2F in two situations: 1) it is in the query part of the URI,
therefore not exposed to %2F -> '/' translations and 2) the request
1.312 +3 -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.311
retrieving revision 1.312
diff -u -r1.311 -r1.312
--- http_main.c 1998/03/25 10:07:50 1.311
+++ http_main.c 1998/03/26 19:03:02 1.312
@@ -2816,6 +2816,9 @@
if (fd < 0) {
fd = make_sock(p, &lr->local_addr);
}
+ else {
+ note_cleanups_for_socket(p, fd);
+ }
if (fd >= 0) {
FD_SET(fd, &listenfds);
if (fd > listenmaxfd)
