[Zodb-checkins] CVS: ZODB3/ZEO/zrpc - client.py:1.11

Guido van Rossum guido@python.org
Thu, 12 Sep 2002 13:58:05 -0400


Update of /cvs-repository/ZODB3/ZEO/zrpc
In directory cvs.zope.org:/tmp/cvs-serv10829

Modified Files:
	client.py 
Log Message:
Fix for Win2K: add errno.WSAEINVAL to _CONNECT_OK (the possible errno
values that connect_ex() may return when we're connected).  This seems
to resolve the last hangs observed on Win2K.  There are still
(unrelated) hangs on Win98 though.


=== ZODB3/ZEO/zrpc/client.py 1.10 => 1.11 ===
--- ZODB3/ZEO/zrpc/client.py:1.10	Thu Sep 12 00:30:19 2002
+++ ZODB3/ZEO/zrpc/client.py	Thu Sep 12 13:58:04 2002
@@ -184,7 +184,8 @@
 # already connected (our code can attempt redundant connects).
 if hasattr(errno, "WSAEWOULDBLOCK"):    # Windows
     _CONNECT_IN_PROGRESS = (errno.WSAEWOULDBLOCK,)
-    _CONNECT_OK          = (0, errno.WSAEISCONN)
+    # Win98: WSAEISCONN; Win2K: WSAEINVAL
+    _CONNECT_OK          = (0, errno.WSAEISCONN, errno.WSAEINVAL)
 else:                                   # Unix
     _CONNECT_IN_PROGRESS = (errno.EINPROGRESS,)
     _CONNECT_OK          = (0, errno.EISCONN)