0b9cc7f · typeable/wai

git.iko.soy/typeable/wai

Merge PR #759.

commit0b9cc7f5a6e912c81e1a71fb8dc782ff47dbe6b8 authorKazu Yamamoto <kazu@iij.ad.jp> dateTue 10 Sep 2019, 11:38 (7 years ago) parent209b133 aee7377

2 files changed+14

compare with master

unifiedsplit

warp-tls/Network/Wai/Handler/WarpTLS.hs+7 warp/Network/Wai/Handler/Warp/Run.hs+7

warp-tls/Network/Wai/Handler/WarpTLS.hs+7

@@ -53,6 +53,9 @@ import qualified Data.IORef as I

5353import Data.Streaming.Network (bindPortTCP, safeRecv)

5454import Data.Typeable (Typeable)

5555import Network.Socket (Socket, close, withSocketsDo, SockAddr, accept)

56+#if MIN_VERSION_network(3,1,1)

57+import Network.Socket (gracefulClose)

58+#endif

5659import Network.Socket.ByteString (sendAll)

5760import qualified Network.TLS as TLS

5861import qualified Crypto.PubKey.DH as DH

@@ -355,7 +358,11 @@ httpOverTls TLSSettings{..} s bs0 params = do

355358 where

356359 backend recvN = TLS.Backend {

357360 TLS.backendFlush = return ()

361+#if MIN_VERSION_network(3,1,1)

362+ , TLS.backendClose = gracefulClose s 5000

363+#else

358364 , TLS.backendClose = close s

365+#endif

359366 , TLS.backendSend = sendAll' s

360367 , TLS.backendRecv = recvN

361368 }

warp/Network/Wai/Handler/Warp/Run.hs+7

@@ -23,6 +23,9 @@ import Foreign.C.Error (Errno(..), eCONNABORTED)

2323import GHC.IO.Exception (IOException(..))

2424import qualified Network.HTTP2 as H2

2525import Network.Socket (Socket, close, accept, withSocketsDo, SockAddr(SockAddrInet, SockAddrInet6), setSocketOption, SocketOption(..))

26+#if MIN_VERSION_network(3,1,1)

27+import Network.Socket (gracefulClose)

28+#endif

2629import qualified Network.Socket.ByteString as Sock

2730import Network.Wai

2831import Network.Wai.Internal (ResponseReceived (ResponseReceived))

@@ -64,7 +67,11 @@ socketConnection s = do

6467 connSendMany = Sock.sendMany s

6568 , connSendAll = sendall

6669 , connSendFile = sendFile s writeBuf bufferSize sendall

70+#if MIN_VERSION_network(3,1,1)

71+ , connClose = gracefulClose s 5000

72+#else

6773 , connClose = close s

74+#endif

6875 , connFree = freeBuffer writeBuf

6976 , connRecv = receive s bufferPool

7077 , connRecvBuf = receiveBuf s