git.iko.soy/typeable/wai
on master help sign in
removing unnecessary imports.
commit9319f43b08a2f9c2621f2fcc8c08298d2cfa4f18 authorKazu Yamamoto <kazu@iij.ad.jp> dateThu 10 Oct 2013, 16:37 (13 years ago) parentc3f616d
3 files changed+3−6
compare with master
unifiedsplit
warp/Network/Wai/Handler/Warp/FdCache.hs−1 warp/Network/Wai/Handler/Warp/Request.hs−1 warp/Network/Wai/Handler/Warp/Run.hs+3−4
warp/Network/Wai/Handler/Warp/FdCache.hs−1
@@ -9,7 +9,6 @@ module Network.Wai.Handler.Warp.FdCache (
99import Control.Applicative ((<$>), (<*>))
1010import Control.Concurrent
1111import Control.Exception (mask_)
12−import Control.Monad
1312import Data.Hashable
1413import Data.IORef
1514import Network.Wai.Handler.Warp.MultiMap
warp/Network/Wai/Handler/Warp/Request.hs−1
@@ -16,7 +16,6 @@ import Data.Conduit
1616import qualified Data.IORef as I
1717import Data.Maybe (fromMaybe)
1818import Data.Monoid (mempty)
19−import Data.Void (Void)
2019import Data.Word (Word8)
2120import qualified Network.HTTP.Types as H
2221import Network.Socket (SockAddr)
warp/Network/Wai/Handler/Warp/Run.hs+3−4
@@ -5,7 +5,7 @@
55module Network.Wai.Handler.Warp.Run where
66
77import Control.Concurrent (threadDelay, forkIOWithUnmask)
8−import Control.Exception
8+import Control.Exception as E
99import Control.Monad (forever, when, unless, void)
1010import Control.Monad.IO.Class (MonadIO, liftIO)
1111import Control.Monad.Trans.Class (lift)
@@ -27,7 +27,6 @@ import Network.Wai.Handler.Warp.Response
2727import Network.Wai.Handler.Warp.Settings
2828import qualified Network.Wai.Handler.Warp.Timeout as T
2929import Network.Wai.Handler.Warp.Types
30−import Prelude hiding (catch)
3130
3231-- Sock.recv first tries to call recvfrom() optimistically.
3332-- If EAGAIN returns, it polls incoming data with epoll/kqueue.
@@ -212,7 +211,7 @@ runSettingsConnectionMaker set getConn app = do
212211 serveConnection th set cleaner port app conn addr
213212 where
214213 -- FIXME: only IOEception is caught. What about other exceptions?
215− getConnLoop = getConn `catch` \(e :: IOException) -> do
214+ getConnLoop = getConn `E.catch` \(e :: IOException) -> do
216215 onE (toException e)
217216 -- "resource exhausted (Too many open files)" may happen by accept().
218217 -- Wait a second hoping that resource will be available.
@@ -270,7 +269,7 @@ serveConnection timeoutHandle settings cleaner port app conn remoteHost' =
270269 intercept fromClient' conn
271270
272271respondOnException :: Settings -> Cleaner -> Connection -> SockAddr -> IO () -> IO ()
273−respondOnException settings cleaner conn remoteHost' io = io `catch` \e@(SomeException _) -> do
272+respondOnException settings cleaner conn remoteHost' io = io `E.catch` \e@(SomeException _) -> do
274273 _ <- runResourceT $ sendResponse settings cleaner blankRequest conn internalError
275274 throwIO e
276275 where