mirror of
https://github.com/commercialhaskell/stackage.git
synced 2026-01-12 07:18:31 +01:00
48 lines
2.1 KiB
Diff
48 lines
2.1 KiB
Diff
diff -ru orig/io-streams.cabal new/io-streams.cabal
|
|
--- orig/io-streams.cabal 2013-12-24 06:42:56.449491097 +0200
|
|
+++ new/io-streams.cabal 2013-12-24 06:42:56.000000000 +0200
|
|
@@ -162,7 +162,7 @@
|
|
attoparsec >= 0.10 && <0.11,
|
|
blaze-builder >= 0.3.1 && <0.4,
|
|
bytestring >= 0.9 && <0.11,
|
|
- network >= 2.4 && <2.5,
|
|
+ network >= 2.3 && <2.5,
|
|
primitive >= 0.2 && <0.6,
|
|
process >= 1 && <1.3,
|
|
text >= 0.10 && <1.1,
|
|
@@ -246,7 +246,7 @@
|
|
directory >= 1.1 && <2,
|
|
filepath >= 1.2 && <2,
|
|
mtl >= 2 && <3,
|
|
- network >= 2.4 && <2.5,
|
|
+ network >= 2.3 && <2.5,
|
|
primitive >= 0.2 && <0.6,
|
|
process >= 1 && <1.3,
|
|
text >= 0.10 && <1.1,
|
|
diff -ru orig/test/System/IO/Streams/Tests/Network.hs new/test/System/IO/Streams/Tests/Network.hs
|
|
--- orig/test/System/IO/Streams/Tests/Network.hs 2013-12-24 06:42:56.441491095 +0200
|
|
+++ new/test/System/IO/Streams/Tests/Network.hs 2013-12-24 06:42:56.000000000 +0200
|
|
@@ -44,18 +44,18 @@
|
|
Streams.fromList ["", "ok"] >>= Streams.connectTo os
|
|
N.shutdown sock N.ShutdownSend
|
|
Streams.toList is >>= putMVar resultMVar
|
|
- N.close sock
|
|
+ N.sClose sock
|
|
|
|
server mvar = do
|
|
sock <- N.socket N.AF_INET N.Stream N.defaultProtocol
|
|
addr <- N.inet_addr "127.0.0.1"
|
|
let saddr = N.SockAddrInet N.aNY_PORT addr
|
|
- N.bind sock saddr
|
|
+ N.bindSocket sock saddr
|
|
N.listen sock 5
|
|
port <- N.socketPort sock
|
|
putMVar mvar port
|
|
(csock, _) <- N.accept sock
|
|
(is, os) <- Streams.socketToStreams csock
|
|
Streams.toList is >>= flip Streams.writeList os
|
|
- N.close csock
|
|
- N.close sock
|
|
+ N.sClose csock
|
|
+ N.sClose sock
|