[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

[John Goerzen]

The following commit has been merged in the master branch:
commit 99240c9a9c7f480b718ce6b6e6c632f3c4400483
Author: John Goerzen <jgoerzen at complete.org>
Date:   Thu Dec 23 05:23:24 2004 +0100

    FTP downloading works
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--0.7--patch-149)

diff --git a/ChangeLog b/ChangeLog
index 0a4cdd2..1fa1164 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,18 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--0.7
 #
 
+2004-12-22 22:23:24 GMT	John Goerzen <jgoerzen at complete.org>	patch-149
+
+    Summary:
+      FTP downloading works
+    Revision:
+      missingh--head--0.7--patch-149
+
+
+    modified files:
+     ChangeLog libsrc/MissingH/Network/FTP/Server.hs
+
+
 2004-12-22 22:17:09 GMT	John Goerzen <jgoerzen at complete.org>	patch-148
 
     Summary:
diff --git a/libsrc/MissingH/Network/FTP/Server.hs b/libsrc/MissingH/Network/FTP/Server.hs
index 21ba474..3f97c89 100644
--- a/libsrc/MissingH/Network/FTP/Server.hs
+++ b/libsrc/MissingH/Network/FTP/Server.hs
@@ -374,7 +374,8 @@ cmd_retr h@(FTPServer _ fs state) args =
            then do sendReply h 501 "Filename required"
                    return True
            else trapIOError h (vOpen fs args ReadMode) (\fhencap ->
-                             trapIOError h (runDataChan h (runit fhencap)) $
+                             trapIOError h (do sendReply h 150 "File OK; about to open data channel"
+                                               (runDataChan h (runit fhencap))) $
                                                    (\_ ->
                        do case fhencap of
                              HVFSOpenEncap fh -> vClose fh
@@ -382,6 +383,7 @@ cmd_retr h@(FTPServer _ fs state) args =
                           return True
                                                                 )
                                                   )
+
        
 
 help_rnto = ("Specify TO name for a file name", "")

-- 
haskell-testpack