websockets 0.9.6.2 → 0.9.7.0
raw patch · 3 files changed
+12/−6 lines, 3 filesdep ~QuickCheck
Dependency ranges changed: QuickCheck
Files
- CHANGELOG +4/−0
- src/Network/WebSockets/Server.hs +5/−3
- websockets.cabal +3/−3
CHANGELOG view
@@ -1,3 +1,7 @@+- 0.9.7.0+ * Fix issue trying to kill builtin server+ * Bump `QuickCheck` dependency to 2.9+ - 0.9.6.2 * Bump `binary` dependency for GHC 8.0 compatibility
src/Network/WebSockets/Server.hs view
@@ -15,8 +15,9 @@ -------------------------------------------------------------------------------- import Control.Concurrent (forkIOWithUnmask)-import Control.Exception (bracket, bracketOnError,- finally, throwIO, mask_)+import Control.Exception (allowInterrupt, bracket,+ bracketOnError, finally, mask_,+ throwIO) import Control.Monad (forever, void) import Network.Socket (Socket) import qualified Network.Socket as S@@ -60,7 +61,8 @@ (makeListenSocket host port) S.sClose (\sock ->- forever $ mask_ $ do+ mask_ $ forever $ do+ allowInterrupt (conn, _) <- S.accept sock void $ forkIOWithUnmask $ \unmask -> finally (unmask $ runApp conn opts app) (S.sClose conn)
websockets.cabal view
@@ -1,5 +1,5 @@ Name: websockets-Version: 0.9.6.2+Version: 0.9.7.0 Synopsis: A sensible and clean way to write WebSocket-capable servers in Haskell.@@ -70,7 +70,7 @@ Build-depends: attoparsec >= 0.10 && < 0.14,- base >= 4 && < 5,+ base >= 4.4 && < 5, base64-bytestring >= 0.1 && < 1.1, binary >= 0.5 && < 0.9, blaze-builder >= 0.3 && < 0.5,@@ -98,7 +98,7 @@ Build-depends: HUnit >= 1.2 && < 1.4,- QuickCheck >= 2.7 && < 2.9,+ QuickCheck >= 2.7 && < 2.10, test-framework >= 0.4 && < 0.9, test-framework-hunit >= 0.2 && < 0.4, test-framework-quickcheck2 >= 0.2 && < 0.4,