[Zodb-checkins] CVS: ZODB3/ZEO - ServerStub.py:1.16.6.2

[Jeremy Hylton]

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

Modified Files:
      Tag: Zope-2_7-branch
	ServerStub.py 
Log Message:
Extend version negotiation to handle getAuthProtocol().

The server doesn't send its handshake until it receives the client. The
ServerStub needs to wait until the server responds to decide what
version to use.


=== ZODB3/ZEO/ServerStub.py 1.16.6.1 => 1.16.6.2 ===
--- ZODB3/ZEO/ServerStub.py:1.16.6.1	Mon Sep 15 17:26:53 2003
+++ ZODB3/ZEO/ServerStub.py	Tue Sep 30 14:50:57 2003
@@ -32,9 +32,13 @@
         zrpc.connection.Connection class.
         """
         self.rpc = rpc
-        if self.rpc.peer_protocol_version == 'Z200':
+        # Wait until we know what version the other side is using.
+        while rpc.peer_protocol_version is None:
+            rpc.pending()
+        if rpc.peer_protocol_version == 'Z200':
             self.lastTransaction = lambda: None
             self.getInvalidations = lambda tid: None
+            self.getAuthProtocol = lambda: None
 
     def extensionMethod(self, name):
         return ExtensionMethodWrapper(self.rpc, name).call