Author: mturk
Date: Wed Dec 23 07:33:28 2009
New Revision: 893416
URL: http://svn.apache.org/viewvc?rev=893416&view=rev
Log:
Do a restartable close()
Modified:
tomcat/jk/trunk/native/common/jk_connect.c
Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=893416&r1=893415&r2=893416&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Wed Dec 23 07:33:28 2009
@@ -658,10 +658,12 @@
#if defined(WIN32) || (defined(NETWARE) && defined(__NOVELL_LIBC__))
rc = closesocket(sd) ? -1 : 0;
#else
- rc = close(sd);
+ do {
+ rc = close(sd);
+ } while (JK_IS_SOCKET_ERROR(rc) && (errno == EINTR || errno == EAGAIN));
#endif
- errno = save_errno;
JK_TRACE_EXIT(l);
+ errno = save_errno;
return rc;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
