[Zope-Checkins] CVS: Zope/ZServer - FTPServer.py:1.21.16.1

[Chris McDonough]

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

Modified Files:
      Tag: Zope-2_5-branch
	FTPServer.py 
Log Message:
Fixed bug reported on maillist during EWOULDBLOCK when using FTP server (http://lists.zope.org/pipermail/zope/2002-March/111521.html).


=== Zope/ZServer/FTPServer.py 1.21 => 1.21.16.1 ===
 
     def handle_accept (self):
-        conn, addr = self.accept()
+        try:
+            conn, addr = self.accept()
+        except TypeError:
+            # unpack non-sequence as result of accept
+            # returning None (in case of EWOULDBLOCK)
+            return
         self.total_sessions.increment()
         self.log_info('Incoming connection from %s:%d' % (addr[0], addr[1]))
         self.ftp_channel_class (self, conn, addr, self.module)