8174ca5 · typeable/wai

git.iko.soy/typeable/wai

fixing modularity.

commit8174ca5e8839d2fb1d641698fd7ad4203014d970 authorKazu Yamamoto <kazu@iij.ad.jp> dateTue 14 Aug 2012, 16:18 (14 years ago) parent3163b71

2 files changed+11−13

compare with master

unifiedsplit

warp/Network/Wai/Handler/Warp/Run.hs+11 warp/Network/Wai/Handler/Warp/Types.hs−13

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

@@ -14,7 +14,9 @@ import Data.Conduit.Internal (ResumableSource (..))

1414import qualified Data.Conduit.List as CL

1515import Data.Conduit.Network (bindPort)

1616import Network (sClose, Socket)

17+import Network.Sendfile

1718import Network.Socket (accept, SockAddr)

19+import qualified Network.Socket.ByteString as Sock

1820import Network.Wai

1921import Network.Wai.Handler.Warp.Request

2022import Network.Wai.Handler.Warp.Response

@@ -28,6 +30,15 @@ import qualified Control.Concurrent.MVar as MV

2830import Network.Socket (withSocketsDo)

2931#endif

3032

33+socketConnection :: Socket -> Connection

34+socketConnection s = Connection

35+ { connSendMany = Sock.sendMany s

36+ , connSendAll = Sock.sendAll s

37+ , connSendFile = \fp off len act hdr -> sendfileWithHeader s fp (PartOfFile off len) act hdr

38+ , connClose = sClose s

39+ , connRecv = Sock.recv s bytesPerRead

40+ }

41+

3142#if __GLASGOW_HASKELL__ < 702

3243allowInterrupt :: IO ()

3344allowInterrupt = unblock $ return ()

warp/Network/Wai/Handler/Warp/Types.hs−13

@@ -7,9 +7,6 @@ import Data.ByteString (ByteString)

77import qualified Data.ByteString.Char8 as B

88import Data.Typeable (Typeable)

99import Data.Version (showVersion)

10−import Network (sClose, Socket)

11−import Network.Sendfile

12−import qualified Network.Socket.ByteString as Sock

1310import qualified Paths_warp

1411

1512warpVersion :: String

@@ -57,13 +54,3 @@ data Connection = Connection

5754 , connClose :: IO ()

5855 , connRecv :: IO B.ByteString

5956 }

60−

61−socketConnection :: Socket -> Connection

62−socketConnection s = Connection

63− { connSendMany = Sock.sendMany s

64− , connSendAll = Sock.sendAll s

65− , connSendFile = \fp off len act hdr -> sendfileWithHeader s fp (PartOfFile off len) act hdr

66− , connClose = sClose s

67− , connRecv = Sock.recv s bytesPerRead

68− }

69−