You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jo...@apache.org on 2004/04/15 22:17:58 UTC
cvs commit: apr/network_io/unix sockets.c
jorton 2004/04/15 13:17:58
Modified: network_io/unix Tag: APR_0_9_BRANCH sockets.c
Log:
Backport from HEAD:
* network_io/unix/sockets.c (apr_socket_accept): Move TPF check for
accept returning zero out of httpd.
Revision Changes Path
No revision
No revision
1.110.2.3 +7 -0 apr/network_io/unix/sockets.c
Index: sockets.c
===================================================================
RCS file: /home/cvs/apr/network_io/unix/sockets.c,v
retrieving revision 1.110.2.2
retrieving revision 1.110.2.3
diff -w -d -u -r1.110.2.2 -r1.110.2.3
--- sockets.c 13 Feb 2004 09:33:51 -0000 1.110.2.2
+++ sockets.c 15 Apr 2004 20:17:58 -0000 1.110.2.3
@@ -167,6 +167,13 @@
if ((*new)->socketdes < 0) {
return errno;
}
+#ifdef TPF
+ if ((*new)->socketdes == 0) {
+ /* 0 is an invalid socket for TPF */
+ return APR_EINTR;
+ }
+#endif
+
*(*new)->local_addr = *sock->local_addr;
/* The above assignment just overwrote the pool entry. Setting the local_addr