Commit 518fe525 authored by Andreas Jung's avatar Andreas Jung

- Collector 386: workaround for hanging FTP connections

        with NcFTP
parent 9945cdf2
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# All Rights Reserved. # All Rights Reserved.
# #
RCS_ID = '$Id: ftp_server.py,v 1.20 2002/04/08 17:03:57 shane Exp $' RCS_ID = '$Id: ftp_server.py,v 1.21 2002/05/09 16:58:38 andreasjung Exp $'
# An extensible, configurable, asynchronous FTP server. # An extensible, configurable, asynchronous FTP server.
# #
...@@ -683,9 +683,9 @@ class ftp_channel (asynchat.async_chat): ...@@ -683,9 +683,9 @@ class ftp_channel (asynchat.async_chat):
if help_lines: if help_lines:
self.push ('214-The following commands are recognized\r\n') self.push ('214-The following commands are recognized\r\n')
self.push_with_producer (producers.lines_producer (help_lines)) self.push_with_producer (producers.lines_producer (help_lines))
self.push ('214\r\n') self.push ('214 \r\n')
else: else:
self.push ('214-\r\n\tHelp Unavailable\r\n214\r\n') self.push ('214-\r\n\tHelp Unavailable\r\n214 \r\n')
class ftp_server (asyncore.dispatcher): class ftp_server (asyncore.dispatcher):
# override this to spawn a different FTP channel class. # override this to spawn a different FTP channel class.
......
...@@ -223,6 +223,10 @@ Zope Changes ...@@ -223,6 +223,10 @@ Zope Changes
- Collector #348: decapitate() now recognizes both \r\n and \n\n - Collector #348: decapitate() now recognizes both \r\n and \n\n
to be compliant with the HTTP RFC to be compliant with the HTTP RFC
- Collector 386: workaround for hanging FTP connections
with NcFTP
Zope 2.5.1 beta 1 Zope 2.5.1 beta 1
Bugs Fixed Bugs Fixed
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# All Rights Reserved. # All Rights Reserved.
# #
RCS_ID = '$Id: ftp_server.py,v 1.20 2002/04/08 17:03:57 shane Exp $' RCS_ID = '$Id: ftp_server.py,v 1.21 2002/05/09 16:58:38 andreasjung Exp $'
# An extensible, configurable, asynchronous FTP server. # An extensible, configurable, asynchronous FTP server.
# #
...@@ -683,9 +683,9 @@ class ftp_channel (asynchat.async_chat): ...@@ -683,9 +683,9 @@ class ftp_channel (asynchat.async_chat):
if help_lines: if help_lines:
self.push ('214-The following commands are recognized\r\n') self.push ('214-The following commands are recognized\r\n')
self.push_with_producer (producers.lines_producer (help_lines)) self.push_with_producer (producers.lines_producer (help_lines))
self.push ('214\r\n') self.push ('214 \r\n')
else: else:
self.push ('214-\r\n\tHelp Unavailable\r\n214\r\n') self.push ('214-\r\n\tHelp Unavailable\r\n214 \r\n')
class ftp_server (asyncore.dispatcher): class ftp_server (asyncore.dispatcher):
# override this to spawn a different FTP channel class. # override this to spawn a different FTP channel class.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment