Until now, Medusa FTP passive mode sockets were blocking. Fixed.

84c1576e · Shane Hathaway · 488d94d7 · 84c1576e · 84c1576e
Commit 84c1576e authored Apr 08, 2002 by Shane Hathaway
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

ZServer/medusa/ftp_server.py ZServer/medusa/ftp_server.py +2 -1

lib/python/ZServer/medusa/ftp_server.py lib/python/ZServer/medusa/ftp_server.py +2 -1

No files found.
--- a/ZServer/medusa/ftp_server.py
+++ b/ZServer/medusa/ftp_server.py
@@ -5,7 +5,7 @@
 #						 All Rights Reserved.
 #
-RCS_ID =  '$Id: ftp_server.py,v 1.19 2002/03/21 15:48:53 htrd Exp $'
+RCS_ID =  '$Id: ftp_server.py,v 1.20 2002/04/08 17:03:57 shane Exp $'
 # An extensible, configurable, asynchronous FTP server.
 # 
@@ -832,6 +832,7 @@ class passive_acceptor (asyncore.dispatcher):
    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)

--- a/lib/python/ZServer/medusa/ftp_server.py
+++ b/lib/python/ZServer/medusa/ftp_server.py
@@ -5,7 +5,7 @@
 #						 All Rights Reserved.
 #
-RCS_ID =  '$Id: ftp_server.py,v 1.19 2002/03/21 15:48:53 htrd Exp $'
+RCS_ID =  '$Id: ftp_server.py,v 1.20 2002/04/08 17:03:57 shane Exp $'
 # An extensible, configurable, asynchronous FTP server.
 # 
@@ -832,6 +832,7 @@ class passive_acceptor (asyncore.dispatcher):
    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)