manoj 99/10/29 17:25:31
Modified: src/os/unix iol_socket.c
Log:
Fix a horrible bug causing all sorts of insanely weird file descriptor
bugs. Both APR (during pool cleanup) and IOL (triggered by bclose) were
trying to close the same socket.
As a temporary hack, this patch makes the socket's iol_close a no-op, so
that buff doesn't actually close the socket.
Revision Changes Path
1.10 +8 -0 apache-2.0/src/os/unix/iol_socket.c
Index: iol_socket.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/os/unix/iol_socket.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -u -r1.9 -r1.10
--- iol_socket.c 1999/10/26 05:29:40 1.9
+++ iol_socket.c 1999/10/30 00:25:31 1.10
@@ -207,6 +207,13 @@
static ap_status_t unix_close(ap_iol *viol)
{
+
+/* XXX: This is a *temporary* ultra-hack solution to the double-close
problem.
+ * APR and buff were both trying to close this socket */
+
+ return APR_SUCCESS;
+
+#if 0
iol_socket *iol = (iol_socket *)viol;
int rv;
int saved_errno;
@@ -218,6 +225,7 @@
return APR_SUCCESS;
}
return saved_errno;
+#endif
}
static const ap_iol_methods socket_methods = {
