on master help sign in
catching up to GHC 7.8.
62058cbKazu Yamamoto
warp/Network/Wai/Handler/Warp/Request.hs+1−1
@@ -6,7 +6,7 @@ module Network.Wai.Handler.Warp.Request where
6
6
7import Control.Applicative
7import Control.Applicative
8import Control.Exception.Lifted (throwIO)
8import Control.Exception.Lifted (throwIO)
9−import Control.Monad.IO.Class (MonadIO, liftIO)
9+import Control.Monad.IO.Class (liftIO)
10import Data.ByteString (ByteString)
10import Data.ByteString (ByteString)
11import qualified Data.ByteString as S
11import qualified Data.ByteString as S
12import qualified Data.ByteString.Char8 as B (unpack)
12import qualified Data.ByteString.Char8 as B (unpack)
warp/Network/Wai/Handler/Warp/Response.hs+1−1
@@ -11,7 +11,7 @@ import Blaze.ByteString.Builder (fromByteString, Builder, toByteStringIO, flush)
11import Blaze.ByteString.Builder.HTTP (chunkedTransferEncoding, chunkedTransferTerminator)
11import Blaze.ByteString.Builder.HTTP (chunkedTransferEncoding, chunkedTransferTerminator)
12import Control.Applicative
12import Control.Applicative
13import Control.Exception
13import Control.Exception
14−import Control.Monad.IO.Class (MonadIO, liftIO)
14+import Control.Monad.IO.Class (liftIO)
15import Data.ByteString (ByteString)
15import Data.ByteString (ByteString)
16import qualified Data.ByteString.Char8 as B (pack)
16import qualified Data.ByteString.Char8 as B (pack)
17import qualified Data.CaseInsensitive as CI
17import qualified Data.CaseInsensitive as CI
warp/Network/Wai/Handler/Warp/Run.hs+2−2
@@ -8,7 +8,7 @@ import Control.Concurrent (threadDelay, forkIOWithUnmask)
8import qualified Control.Concurrent as Conc (yield)
8import qualified Control.Concurrent as Conc (yield)
9import Control.Exception as E
9import Control.Exception as E
10import Control.Monad (forever, when, unless, void)
10import Control.Monad (forever, when, unless, void)
11−import Control.Monad.IO.Class (MonadIO, liftIO)
11+import Control.Monad.IO.Class (liftIO)
12import Data.ByteString (ByteString)
12import Data.ByteString (ByteString)
13import qualified Data.ByteString as S
13import qualified Data.ByteString as S
14import Data.Conduit
14import Data.Conduit
@@ -237,7 +237,7 @@ serveConnection timeoutHandle settings cleaner app conn remoteHost' =
237 where
237 where
238 th = threadHandle cleaner
238 th = threadHandle cleaner
239
239
240− send500 = void . mask $ \restore ->
240+ send500 = void $ mask $ \restore ->
241 sendResponse settings cleaner dummyreq conn restore internalError
241 sendResponse settings cleaner dummyreq conn restore internalError
242
242
243 dummyreq = defaultRequest { remoteHost = remoteHost' }
243 dummyreq = defaultRequest { remoteHost = remoteHost' }