git.iko.soy/typeable/wai
on master help sign in
settingsIntercept lives in IO
803836cMichael Snoyman
warp/Network/Wai/Handler/Warp/Run.hs+2−1
compare with master
unifiedsplit
@@ -239,7 +239,8 @@ serveConnection conn ii addr settings app = do
239
239
240 recvSendLoop istatus fromClient = do
240 recvSendLoop istatus fromClient = do
241 (req, idxhdr, getSource) <- recvRequest settings conn ii addr fromClient
241 (req, idxhdr, getSource) <- recvRequest settings conn ii addr fromClient
242− case settingsIntercept settings req of
242+ intercept' <- settingsIntercept settings req
243+ case intercept' of
243 Nothing -> do
244 Nothing -> do
244 -- Let the application run for as long as it wants
245 -- Let the application run for as long as it wants
245 T.pause th
246 T.pause th
warp/Network/Wai/Handler/Warp/Settings.hs+2−2
@@ -35,7 +35,7 @@ data Settings = Settings
35 , settingsOnOpen :: SockAddr -> IO Bool -- ^ What to do when a connection is open. When 'False' is returned, the connection is closed immediately. Otherwise, the connection is going on. Default: always returns 'True'.
35 , settingsOnOpen :: SockAddr -> IO Bool -- ^ What to do when a connection is open. When 'False' is returned, the connection is closed immediately. Otherwise, the connection is going on. Default: always returns 'True'.
36 , settingsOnClose :: SockAddr -> IO () -- ^ What to do when a connection is close. Default: do nothing.
36 , settingsOnClose :: SockAddr -> IO () -- ^ What to do when a connection is close. Default: do nothing.
37 , settingsTimeout :: Int -- ^ Timeout value in seconds. Default value: 30
37 , settingsTimeout :: Int -- ^ Timeout value in seconds. Default value: 30
38− , settingsIntercept :: Request -> Maybe (Source IO S.ByteString -> Connection -> IO ())
38+ , settingsIntercept :: Request -> IO (Maybe (Source IO S.ByteString -> Connection -> IO ()))
39 , settingsManager :: Maybe Manager -- ^ Use an existing timeout manager instead of spawning a new one. If used, 'settingsTimeout' is ignored. Default is 'Nothing'
39 , settingsManager :: Maybe Manager -- ^ Use an existing timeout manager instead of spawning a new one. If used, 'settingsTimeout' is ignored. Default is 'Nothing'
40 , settingsFdCacheDuration :: Int -- ^ Cache duratoin time of file descriptors in seconds. 0 means that the cache mechanism is not used. Default value: 10
40 , settingsFdCacheDuration :: Int -- ^ Cache duratoin time of file descriptors in seconds. 0 means that the cache mechanism is not used. Default value: 10
41 , settingsBeforeMainLoop :: IO ()
41 , settingsBeforeMainLoop :: IO ()
@@ -67,7 +67,7 @@ defaultSettings = Settings
67 , settingsOnOpen = const $ return True
67 , settingsOnOpen = const $ return True
68 , settingsOnClose = const $ return ()
68 , settingsOnClose = const $ return ()
69 , settingsTimeout = 30
69 , settingsTimeout = 30
70− , settingsIntercept = const Nothing
70+ , settingsIntercept = const (return Nothing)
71 , settingsManager = Nothing
71 , settingsManager = Nothing
72 , settingsFdCacheDuration = 10
72 , settingsFdCacheDuration = 10
73 , settingsBeforeMainLoop = return ()
73 , settingsBeforeMainLoop = return ()