eed0bf9 · typeable/wai

git.iko.soy/typeable/wai

Replace acceptSafe with accept #361 @kazu-yamamoto

commiteed0bf9d09383f890ed354cbc4886efb9e356298 authorMichael Snoyman <michael@snoyman.com> dateMon 18 May 2015, 07:25 (11 years ago) parentc2c0920

3 files changed+8−4

unifiedsplit

warp-tls/ChangeLog.md+4

@@ -1,3 +1,7 @@

1+## 3.0.4

3+* Replace `acceptSafe` with `accept`, see [#361](https://github.com/yesodweb/wai/issues/361)

15## 3.0.3

37* Support chain certs [#349](https://github.com/yesodweb/wai/pull/349)

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

@@ -33,13 +33,13 @@ module Network.Wai.Handler.WarpTLS (

3333import qualified Network.TLS as TLS

3434import Network.Wai.Handler.Warp

3535import Network.Wai (Application)

36−import Network.Socket (Socket, sClose, withSocketsDo, SockAddr)

36+import Network.Socket (Socket, sClose, withSocketsDo, SockAddr, accept)

3737import qualified Data.ByteString as S

3838import qualified Data.ByteString.Lazy as L

3939import Control.Exception (bracket, finally, handle, fromException, try, IOException)

4040import qualified Network.TLS.Extra as TLSExtra

4141import qualified Data.ByteString as B

42−import Data.Streaming.Network (bindPortTCP, acceptSafe, safeRecv)

42+import Data.Streaming.Network (bindPortTCP, safeRecv)

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

4444import qualified Data.IORef as I

4545import Control.Exception (Exception, throwIO)

@@ -250,7 +250,7 @@ runTLSSocket' tlsset@TLSSettings{..} set credential sock app =

250250

251251getter :: TLS.TLSParams params => TLSSettings -> Socket -> params -> IO (IO (Connection, Transport), SockAddr)

252252getter tlsset@TLSSettings{..} sock params = do

253− (s, sa) <- acceptSafe sock

253+ (s, sa) <- accept sock

254254 return (mkConn tlsset s params, sa)

255255

256256mkConn :: TLS.TLSParams params => TLSSettings -> Socket -> params -> IO (Connection, Transport)

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

@@ -1,5 +1,5 @@

11Name: warp-tls

2−Version: 3.0.3

2+Version: 3.0.4

33Synopsis: HTTP over SSL/TLS support for Warp via the TLS package

44License: MIT

55License-file: LICENSE