[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 375496e8a3ed93005c594ac0f85b0b02cf66138e
Author: John Goerzen <jgoerzen at complete.org>
Date:   Thu Dec 23 02:36:07 2004 +0100

    Fixed passive mode basics
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--0.7--patch-146)

diff --git a/ChangeLog b/ChangeLog
index f520c42..8911f56 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 19:36:07 GMT	John Goerzen <jgoerzen at complete.org>	patch-146
+
+    Summary:
+      Fixed passive mode basics
+    Revision:
+      missingh--head--0.7--patch-146
+
+
+    modified files:
+     ChangeLog libsrc/MissingH/Network/FTP/ParserClient.hs
+
+
 2004-12-22 19:30:28 GMT	John Goerzen <jgoerzen at complete.org>	patch-145
 
     Summary:
diff --git a/libsrc/MissingH/Network/FTP/ParserClient.hs b/libsrc/MissingH/Network/FTP/ParserClient.hs
index 7af42aa..b4efcb9 100644
--- a/libsrc/MissingH/Network/FTP/ParserClient.hs
+++ b/libsrc/MissingH/Network/FTP/ParserClient.hs
@@ -215,11 +215,11 @@ Example:
 -}
 toPortString :: SockAddr -> IO String
 toPortString (SockAddrInet port hostaddr) =
-    let wport = (fromEnum(port))::Int
+    let wport = (fromIntegral (port))::Word16
         in do
            hn <- inet_ntoa hostaddr
-           return ((replace "." "," hn) ++ "," ++
-                   (genericJoin "," . drop 2 . getBytes $ wport))
+           return ((replace "." "," hn) ++ "," ++ 
+                   (genericJoin "," . getBytes $ wport))
 toPortString _ = 
     error "toPortString only works on AF_INET addresses"
 

-- 
haskell-testpack