c41b30a · typeable/wai

git.iko.soy/typeable/wai

Use acceptSafe in warp-tls

commitc41b30a29cc83bdcb9249a929ddbc68ed4d66a80 authorMichael Snoyman <michael@snoyman.com> dateFri 23 Nov 2012, 09:48 (14 years ago) parente033cbd

2 files changed+3−3

unifiedsplit

warp-tls/Network/Wai/Handler/WarpTLS.hs+2−2

@@ -25,7 +25,7 @@ import Data.Conduit.Network (bindPort)

2525import Data.Either (rights)

2626import Control.Applicative ((<$>))

2727import qualified Data.PEM as PEM

28−import Data.Conduit.Network (sourceSocket, sinkSocket)

28+import Data.Conduit.Network (sourceSocket, sinkSocket, acceptSafe)

2929import Data.Maybe (fromMaybe)

3030import qualified Data.IORef as I

3131import Control.Monad (unless)

@@ -59,7 +59,7 @@ runTLSSocket tset set sock app = do

5959 runSettingsConnectionMaker set (getter params sock) app

6060 where

6161 getter params sock = do

62− (s, sa) <- accept sock

62+ (s, sa) <- acceptSafe sock

6363 let mkConn = do

6464 (fromClient, firstBS) <- sourceSocket s C.$$+ CL.peek

6565 let toClient = sinkSocket s

warp-tls/warp-tls.cabal+1−1

@@ -19,7 +19,7 @@ Library

1919 , warp >= 1.3.2 && < 1.4

2020 , transformers >= 0.2 && < 0.4

2121 , conduit >= 0.5 && < 0.6

22− , network-conduit >= 0.5 && < 0.7

22+ , network-conduit >= 0.6 && < 0.7

2323 , certificate >= 1.2 && < 1.4

2424 , pem >= 0.1 && < 0.2

2525 , cryptocipher >= 0.3 && < 0.4