Merged fix for FTP error messages (bug # 1992)

ZServer/FTPResponse.py

@@ -120,6 +120,11 @@ class FTPResponse(ZServerHTTPResponse):
     def _marshalledBody(self):
         return marshal.loads(self.body)
 
+    def setMessage(self, message):
+        self._message = message
+
+    def getMessage(self):
+        return getattr(self, '_message', '')
  
 class CallbackPipe:
     """

ZServer/FTPServer.py

@@ -404,12 +404,17 @@ class zope_ftp_channel(ftp_channel):
            
     def stor_completion(self,response):
         status=response.getStatus()
+        message = response.getMessage()
+
         if status in (200,201,204,302):
-            self.client_dc.channel.respond('226 Transfer complete.')
+            self.client_dc.channel.respond('226 ' + (
+                message or 'Transfer complete.'))
         elif status==401:
-            self.client_dc.channel.respond('426 Unauthorized.')
+            self.client_dc.channel.respond('426 ' + (
+                message or 'Unauthorized.'))
         else:
-            self.client_dc.channel.respond('426 Error creating file.')       
+            self.client_dc.channel.respond('426 ' + (
+                message or 'Error creating file.'))
         self.client_dc.close()
 
     def cmd_rnfr (self, line):

lib/python/ZServer/FTPResponse.py

@@ -120,6 +120,11 @@ class FTPResponse(ZServerHTTPResponse):
     def _marshalledBody(self):
         return marshal.loads(self.body)
 
+    def setMessage(self, message):
+        self._message = message
+
+    def getMessage(self):
+        return getattr(self, '_message', '')
  
 class CallbackPipe:
     """

lib/python/ZServer/FTPServer.py

@@ -404,12 +404,17 @@ class zope_ftp_channel(ftp_channel):
            
     def stor_completion(self,response):
         status=response.getStatus()
+        message = response.getMessage()
+
         if status in (200,201,204,302):
-            self.client_dc.channel.respond('226 Transfer complete.')
+            self.client_dc.channel.respond('226 ' + (
+                message or 'Transfer complete.'))
         elif status==401:
-            self.client_dc.channel.respond('426 Unauthorized.')
+            self.client_dc.channel.respond('426 ' + (
+                message or 'Unauthorized.'))
         else:
-            self.client_dc.channel.respond('426 Error creating file.')       
+            self.client_dc.channel.respond('426 ' + (
+                message or 'Error creating file.'))
         self.client_dc.close()
 
     def cmd_rnfr (self, line):