[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 f9e480a3d6777b3505ec12378603458565e0e151
Author: John Goerzen <jgoerzen at complete.org>
Date:   Sun Oct 24 10:49:25 2004 +0100

    Fixed listenTCPAddr to take a queue length
    
    Keywords:
    
    
    (jgoerzen at complete.org--projects/missingh--head--1.0--patch-117)

diff --git a/ChangeLog b/ChangeLog
index 0882743..3b5020d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,19 @@
 # arch-tag: automatic-ChangeLog--jgoerzen at complete.org--projects/missingh--head--1.0
 #
 
+2004-10-24 04:49:25 GMT	John Goerzen <jgoerzen at complete.org>	patch-117
+
+    Summary:
+      Fixed listenTCPAddr to take a queue length
+    Revision:
+      missingh--head--1.0--patch-117
+
+
+    modified files:
+     ChangeLog libsrc/MissingH/Network.hs
+     libsrc/MissingH/Network/FTP/Client.hs
+
+
 2004-10-24 04:38:15 GMT	John Goerzen <jgoerzen at complete.org>	patch-116
 
     Summary:
diff --git a/libsrc/MissingH/Network.hs b/libsrc/MissingH/Network.hs
index 8d44a48..a770434 100644
--- a/libsrc/MissingH/Network.hs
+++ b/libsrc/MissingH/Network.hs
@@ -70,10 +70,10 @@ connectTCPAddr addr = do
                       connect s addr
                       return s
                       
-listenTCPAddr :: SockAddr -> IO Socket
-listenTCPAddr addr = do
+listenTCPAddr :: SockAddr -> Int -> IO Socket
+listenTCPAddr addr queuelen = do
                      proto <- getProtocolNumber "tcp"
                      s <- socket AF_INET Stream proto
                      bindSocket s addr
-                     listen s 1
+                     listen s queuelen
                      return s
\ No newline at end of file
diff --git a/libsrc/MissingH/Network/FTP/Client.hs b/libsrc/MissingH/Network/FTP/Client.hs
index e72d652..10f7991 100644
--- a/libsrc/MissingH/Network/FTP/Client.hs
+++ b/libsrc/MissingH/Network/FTP/Client.hs
@@ -185,7 +185,7 @@ makeport h =
         listenaddr _ = error "Can't use port mode to non-TCP server"
         in
         do addr <- getSocketName (socket_internal h)
-           mastersock <- listenTCPAddr (listenaddr addr)
+           mastersock <- listenTCPAddr (listenaddr addr) 1
            newaddr <- getSocketName mastersock
            ps <- toPortString newaddr
            result <- sendcmd h ("PORT " ++ ps)

-- 
haskell-testpack