[Zope-Checkins] CVS: Zope/ZServer/medusa - ftp_server.py:1.18.60.1

[Shane Hathaway]

Update of /cvs-repository/Zope/ZServer/medusa
In directory cvs.zope.org:/tmp/cvs-serv25964

Modified Files:
      Tag: Zope-2_5-branch
	ftp_server.py 
Log Message:
Fixed blocking FTP connections


=== Zope/ZServer/medusa/ftp_server.py 1.18 => 1.18.60.1 ===
 #    methods, using try/finally. [this seems to work]
 
-VERSION = string.split(RCS_ID)[2]
+if RCS_ID.startswith('$Id: '):
+    VERSION = string.split(RCS_ID)[2]
+else:
+    VERSION = '0.0'
 
 from counter import counter
 import producers
@@ -829,6 +832,7 @@
         
     def handle_accept (self):
         conn, addr = self.accept()
+        conn.setblocking(0)
         dc = self.control_channel.client_dc
         if dc is not None:
             dc.set_socket (conn)