@@ -1,101 +1,96 @@
1−{-# LANGUAGE BangPatterns #-}
21{-# LANGUAGE CPP #-}
32{-# LANGUAGE OverloadedStrings #-}
4−{-# LANGUAGE PackageImports #-}
5−{-# LANGUAGE PatternGuards #-}
6−{-# LANGUAGE RecordWildCards #-}
73{-# LANGUAGE ScopedTypeVariables #-}
84{-# LANGUAGE TupleSections #-}
9−{-# LANGUAGE ViewPatterns #-}
5+{-# LANGUAGE PatternGuards #-}
106{-# OPTIONS_GHC -fno-warn-deprecations #-}
117
128module Network.Wai.Handler.Warp.Run where
139
14−import "iproute" Data.IP (toHostAddress, toHostAddress6)
10+#if __GLASGOW_HASKELL__ < 709
11+import Control.Applicative ((<$>))
12+#endif
1513import Control.Arrow (first)
14+import Control.Concurrent (threadDelay)
1615import qualified Control.Concurrent as Conc (yield)
1716import Control.Exception as E
17+import Control.Monad (when, unless, void)
18+import Data.ByteString (ByteString)
1819import qualified Data.ByteString as S
1920import Data.Char (chr)
21+import Data.IP (toHostAddress, toHostAddress6)
2022import Data.IORef (IORef, newIORef, readIORef, writeIORef)
2123import Data.Streaming.Network (bindPortTCP)
22−import Foreign.C.Error (Errno(..), eCONNABORTED)
23−import GHC.IO.Exception (IOException(..))
24−import qualified Network.HTTP2 as H2
25−import 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
24+import Network (sClose, Socket)
25+import Network.Socket (accept, withSocketsDo, SockAddr(SockAddrInet, SockAddrInet6))
2926import qualified Network.Socket.ByteString as Sock
3027import Network.Wai
31−import Network.Wai.Internal (ResponseReceived (ResponseReceived))
32−import System.Environment (lookupEnv)
33−import qualified System.TimeManager as T
34−import System.Timeout (timeout)
35−
28+import Network.Wai.HTTP2 (HTTP2Application, promoteApplication)
3629import Network.Wai.Handler.Warp.Buffer
3730import Network.Wai.Handler.Warp.Counter
3831import qualified Network.Wai.Handler.Warp.Date as D
3932import qualified Network.Wai.Handler.Warp.FdCache as F
4033import qualified Network.Wai.Handler.Warp.FileInfoCache as I
41−import Network.Wai.Handler.Warp.HTTP2 (http2)
42−import Network.Wai.Handler.Warp.HTTP2.Types (isHTTP2)
34+import Network.Wai.Handler.Warp.HTTP2 (http2, isHTTP2)
4335import Network.Wai.Handler.Warp.Header
44−import Network.Wai.Handler.Warp.Imports hiding (readInt)
4536import Network.Wai.Handler.Warp.ReadInt
4637import Network.Wai.Handler.Warp.Recv
4738import Network.Wai.Handler.Warp.Request
4839import Network.Wai.Handler.Warp.Response
4940import Network.Wai.Handler.Warp.SendFile
5041import Network.Wai.Handler.Warp.Settings
42+import qualified Network.Wai.Handler.Warp.Timeout as T
5143import Network.Wai.Handler.Warp.Types
52−
44+import Network.Wai.Internal (ResponseReceived (ResponseReceived))
45+import System.Environment (getEnvironment)
46+import System.IO.Error (isFullErrorType, ioeGetErrorType)
5347
5448#if WINDOWS
5549import Network.Wai.Handler.Warp.Windows
5650#else
51+import System.Posix.IO (FdOption(CloseOnExec), setFdOption)
5752import Network.Socket (fdSocket)
5853#endif
5954
6055-- | Creating 'Connection' for plain HTTP based on a given socket.
61−socketConnection :: Settings -> Socket -> IO Connection
62−#if MIN_VERSION_network(3,1,1)
63−socketConnection set s = do
64−#else
65−socketConnection _ s = do
66−#endif
56+socketConnection :: Socket -> IO Connection
57+socketConnection s = do
6758 bufferPool <- newBufferPool
6859 writeBuf <- allocateBuffer bufferSize
6960 let sendall = Sock.sendAll s
70− isH2 <- newIORef False -- HTTP/1.x
7161 return Connection {
7262 connSendMany = Sock.sendMany s
7363 , connSendAll = sendall
7464 , connSendFile = sendFile s writeBuf bufferSize sendall
75−#if MIN_VERSION_network(3,1,1)
76− , connClose = do
77− h2 <- readIORef isH2
78− let tm = if h2 then settingsGracefulCloseTimeout2 set
79− else settingsGracefulCloseTimeout1 set
80− if tm == 0 then
81− close s
82− else
83− gracefulClose s tm `E.catch` \(E.SomeException _) -> return ()
84−#else
85− , connClose = close s
86−#endif
87− , connFree = freeBuffer writeBuf
65+ , connClose = sClose s >> freeBuffer writeBuf
8866 , connRecv = receive s bufferPool
8967 , connRecvBuf = receiveBuf s
9068 , connWriteBuffer = writeBuf
9169 , connBufferSize = bufferSize
92− , connHTTP2 = isH2
9370 }
9471
72+#if __GLASGOW_HASKELL__ < 702
73+allowInterrupt :: IO ()
74+allowInterrupt = unblock $ return ()
75+#endif
76+
77+-- Composition over two arguments at once; used for runHTTP2\*.
78+(.:) :: (c -> d) -> (a -> b -> c) -> a -> b -> d
79+f .: g = curry $ f . uncurry g
80+
9581-- | Run an 'Application' on the given port.
9682-- This calls 'runSettings' with 'defaultSettings'.
9783run :: Port -> Application -> IO ()
98−run p = runSettings defaultSettings { settingsPort = p }
84+run port = runServe port . serveDefault
85+
86+-- | Serve an 'HTTP2Application' and an 'Application' together on the given
87+-- port.
88+runHTTP2 :: Port -> HTTP2Application -> Application -> IO ()
89+runHTTP2 port = runServe port .: serveHTTP2
90+
91+-- | The generalized form of 'run'.
92+runServe :: Port -> ServeConnection -> IO ()
93+runServe p = runServeSettings defaultSettings { settingsPort = p }
9994
10095-- | Run an 'Application' on the port present in the @PORT@
10196-- environment variable. Uses the 'Port' given when the variable is unset.
@@ -103,28 +98,44 @@ run p = runSettings defaultSettings { settingsPort = p }
10398--
10499-- Since 3.0.9
105100runEnv :: Port -> Application -> IO ()
106−runEnv p app = do
107− mp <- lookupEnv "PORT"
101+runEnv port = runServeEnv port . serveDefault
102+
103+-- | The HTTP\/2-aware form of 'runEnv'.
104+runHTTP2Env :: Port -> HTTP2Application -> Application -> IO ()
105+runHTTP2Env port = runServeEnv port .: serveHTTP2
108106
109− maybe (run p app) runReadPort mp
107+-- | The generalized form of 'runEnv'.
108+runServeEnv :: Port -> ServeConnection -> IO ()
109+runServeEnv p serveConn = do
110+ mp <- lookup "PORT" <$> getEnvironment
111+
112+ maybe (runServe p serveConn) runReadPort mp
110113
111114 where
112115 runReadPort :: String -> IO ()
113116 runReadPort sp = case reads sp of
114− ((p', _):_) -> run p' app
117+ ((p', _):_) -> runServe p' serveConn
115118 _ -> fail $ "Invalid value in $PORT: " ++ sp
116119
117120-- | Run an 'Application' with the given 'Settings'.
118121-- This opens a listen socket on the port defined in 'Settings' and
119122-- calls 'runSettingsSocket'.
120123runSettings :: Settings -> Application -> IO ()
121−runSettings set app = withSocketsDo $
124+runSettings set = runServeSettings set . serveDefault
125+
126+-- | The HTTP\/2-aware form of 'runSettings'.
127+runHTTP2Settings :: Settings -> HTTP2Application -> Application -> IO ()
128+runHTTP2Settings set = runServeSettings set .: serveHTTP2
129+
130+-- | The generalized form of 'runSettings'.
131+runServeSettings :: Settings -> ServeConnection -> IO ()
132+runServeSettings set serveConn = withSocketsDo $
122133 bracket
123134 (bindPortTCP (settingsPort set) (settingsHost set))
124− close
135+ sClose
125136 (\socket -> do
126137 setSocketCloseOnExec socket
127− runSettingsSocket set socket app)
138+ runServeSettingsSocket set socket serveConn)
128139
129140-- | This installs a shutdown handler for the given socket and
130141-- calls 'runSettingsConnection' with the default connection setup action
@@ -138,9 +149,22 @@ runSettings set app = withSocketsDo $
138149-- Note that the 'settingsPort' will still be passed to 'Application's via the
139150-- 'serverPort' record.
140151runSettingsSocket :: Settings -> Socket -> Application -> IO ()
141−runSettingsSocket set socket app = do
152+runSettingsSocket set socket = runServeSettingsSocket set socket . serveDefault
153+
154+-- | The HTTP\/2-aware form of 'runSettingsSocket'.
155+runHTTP2SettingsSocket :: Settings
156+ -> Socket
157+ -> HTTP2Application
158+ -> Application
159+ -> IO ()
160+runHTTP2SettingsSocket set socket =
161+ runServeSettingsSocket set socket .: serveHTTP2
162+
163+-- | The generalized form of 'runSettingsSocket'.
164+runServeSettingsSocket :: Settings -> Socket -> ServeConnection -> IO ()
165+runServeSettingsSocket set socket serveConn = do
142166 settingsInstallShutdownHandler set closeListenSocket
143− runSettingsConnection set getConn app
167+ runServeSettingsConnection set getConn serveConn
144168 where
145169 getConn = do
146170#if WINDOWS
@@ -149,12 +173,10 @@ runSettingsSocket set socket app = do
149173 (s, sa) <- accept socket
150174#endif
151175 setSocketCloseOnExec s
152− -- NoDelay causes an error for AF_UNIX.
153− setSocketOption s NoDelay 1 `E.catch` \(E.SomeException _) -> return ()
154− conn <- socketConnection set s
176+ conn <- socketConnection s
155177 return (conn, sa)
156178
157− closeListenSocket = close socket
179+ closeListenSocket = sClose socket
158180
159181-- | The connection setup action would be expensive. A good example
160182-- is initialization of TLS.
@@ -166,7 +188,16 @@ runSettingsSocket set socket app = do
166188--
167189-- Since 1.3.5
168190runSettingsConnection :: Settings -> IO (Connection, SockAddr) -> Application -> IO ()
169−runSettingsConnection set getConn app = runSettingsConnectionMaker set getConnMaker app
191+runSettingsConnection set getConn =
192+ runServeSettingsConnection set getConn . serveDefault
193+
194+-- | The generalized form of 'runSettingsConnection'.
195+runServeSettingsConnection :: Settings
196+ -> IO (Connection, SockAddr)
197+ -> ServeConnection
198+ -> IO ()
199+runServeSettingsConnection set getConn serveConn =
200+ runServeSettingsConnectionMaker set getConnMaker serveConn
170201 where
171202 getConnMaker = do
172203 (conn, sa) <- getConn
@@ -175,8 +206,16 @@ runSettingsConnection set getConn app = runSettingsConnectionMaker set getConnMa
175206-- | This modifies the connection maker so that it returns 'TCP' for 'Transport'
176207-- (i.e. plain HTTP) then calls 'runSettingsConnectionMakerSecure'.
177208runSettingsConnectionMaker :: Settings -> IO (IO Connection, SockAddr) -> Application -> IO ()
178−runSettingsConnectionMaker x y =
179− runSettingsConnectionMakerSecure x (toTCP <$> y)
209+runSettingsConnectionMaker set getConnMaker =
210+ runServeSettingsConnectionMaker set getConnMaker . serveDefault
211+
212+-- | The generalized form of 'runSettingsConnectionMaker'.
213+runServeSettingsConnectionMaker :: Settings
214+ -> IO (IO Connection, SockAddr)
215+ -> ServeConnection
216+ -> IO ()
217+runServeSettingsConnectionMaker x y =
218+ runServeSettingsConnectionMakerSecure x (toTCP <$> y)
180219 where
181220 toTCP = first ((, TCP) <$>)
182221
@@ -189,26 +228,33 @@ runSettingsConnectionMaker x y =
189228--
190229-- Since 2.1.4
191230runSettingsConnectionMakerSecure :: Settings -> IO (IO (Connection, Transport), SockAddr) -> Application -> IO ()
192−runSettingsConnectionMakerSecure set getConnMaker app = do
231+runSettingsConnectionMakerSecure set getConnMaker =
232+ runServeSettingsConnectionMakerSecure set getConnMaker . serveDefault
233+
234+-- | The generalized form of 'runSettingsConnectionMakerSecure'.
235+runServeSettingsConnectionMakerSecure :: Settings
236+ -> IO (IO (Connection, Transport), SockAddr)
237+ -> ServeConnection
238+ -> IO ()
239+runServeSettingsConnectionMakerSecure set getConnMaker serveConn = do
193240 settingsBeforeMainLoop set
194241 counter <- newCounter
195− withII $ acceptConnection set getConnMaker app counter
242+ withII $ acceptConnection set getConnMaker serveConn counter
196243 where
197244 withII action =
198− withTimeoutManager $ \tm ->
199245 D.withDateCache $ \dc ->
200− F.withFdCache fdCacheDurationInSeconds $ \fdc ->
201− I.withFileInfoCache fdFileInfoDurationInSeconds $ \fic -> do
202− let ii = InternalInfo tm dc fdc fic
203− action ii
204−
205− !fdCacheDurationInSeconds = settingsFdCacheDuration set * 1000000
206− !fdFileInfoDurationInSeconds = settingsFileInfoCacheDuration set * 1000000
207− !timeoutInSeconds = settingsTimeout set * 1000000
246+ F.withFdCache fdCacheDurationInSeconds $ \fc ->
247+ I.withFileInfoCache fdFileInfoDurationInSeconds $ \get ->
248+ withTimeoutManager $ \tm -> do
249+ let ii0 = InternalInfo undefined tm fc get dc -- fixme: undefined
250+ action ii0
251+
252+ fdCacheDurationInSeconds = settingsFdCacheDuration set * 1000000
253+ fdFileInfoDurationInSeconds = settingsFileInfoCacheDuration set * 1000000
208254 withTimeoutManager f = case settingsManager set of
209255 Just tm -> f tm
210256 Nothing -> bracket
211− (T.initialize timeoutInSeconds)
257+ (T.initialize $ settingsTimeout set * 1000000)
212258 T.stopManager
213259 f
214260
@@ -227,21 +273,16 @@ runSettingsConnectionMakerSecure set getConnMaker app = do
227273-- Our approach is explained in the comments below.
228274acceptConnection :: Settings
229275 -> IO (IO (Connection, Transport), SockAddr)
230− -> Application
276+ -> ServeConnection
231277 -> Counter
232278 -> InternalInfo
233279 -> IO ()
234−acceptConnection set getConnMaker app counter ii = do
280+acceptConnection set getConnMaker serveConn counter ii0 = do
235281 -- First mask all exceptions in acceptLoop. This is necessary to
236282 -- ensure that no async exception is throw between the call to
237283 -- acceptNewConnection and the registering of connClose.
238− --
239− -- acceptLoop can be broken by closing the listing socket.
240284 void $ mask_ acceptLoop
241− -- In some cases, we want to stop Warp here without graceful shutdown.
242− -- So, async exceptions are allowed here.
243− -- That's why `finally` is not used.
244− gracefulShutdown set counter
285+ gracefulShutdown counter
245286 where
246287 acceptLoop = do
247288 -- Allow async exceptions before receiving the next connection maker.
@@ -258,78 +299,88 @@ acceptConnection set getConnMaker app counter ii = do
258299 case mx of
259300 Nothing -> return ()
260301 Just (mkConn, addr) -> do
261− fork set mkConn addr app counter ii
302+ fork set mkConn addr serveConn counter ii0
262303 acceptLoop
263304
264305 acceptNewConnection = do
265306 ex <- try getConnMaker
266307 case ex of
267308 Right x -> return $ Just x
268− Left e -> do
269− let eConnAborted = getErrno eCONNABORTED
270− getErrno (Errno cInt) = cInt
271− if ioe_errno e == Just eConnAborted
272− then acceptNewConnection
273− else do
274− settingsOnException set Nothing $ toException e
275− return Nothing
309+ Left e -> do
310+ settingsOnException set Nothing $ toException e
311+ if isFullErrorType (ioeGetErrorType e) then do
312+ -- "resource exhausted (Too many open files)" may
313+ -- happen by accept(). Wait a second hoping that
314+ -- resource will be available.
315+ threadDelay 1000000
316+ acceptNewConnection
317+ else
318+ -- Assuming the listen socket is closed.
319+ return Nothing
276320
277321-- Fork a new worker thread for this connection maker, and ask for a
278322-- function to unmask (i.e., allow async exceptions to be thrown).
279323fork :: Settings
280324 -> IO (Connection, Transport)
281325 -> SockAddr
282− -> Application
326+ -> ServeConnection
283327 -> Counter
284328 -> InternalInfo
285329 -> IO ()
286−fork set mkConn addr app counter ii = settingsFork set $ \unmask ->
287− -- Call the user-supplied on exception code if any
288− -- exceptions are thrown.
289− handle (settingsOnException set Nothing) $
290− -- Run the connection maker to get a new connection, and ensure
291− -- that the connection is closed. If the mkConn call throws an
292− -- exception, we will leak the connection. If the mkConn call is
293− -- vulnerable to attacks (e.g., Slowloris), we do nothing to
294− -- protect the server. It is therefore vital that mkConn is well
295− -- vetted.
296− --
297− -- We grab the connection before registering timeouts since the
298− -- timeouts will be useless during connection creation, due to the
299− -- fact that async exceptions are still masked.
300− bracket mkConn cleanUp (serve unmask)
301− where
302− cleanUp (conn, _) = connClose conn `finally` connFree conn
330+fork set mkConn addr serveConn counter ii0 = settingsFork set $ \ unmask ->
331+ -- Run the connection maker to get a new connection, and ensure
332+ -- that the connection is closed. If the mkConn call throws an
333+ -- exception, we will leak the connection. If the mkConn call is
334+ -- vulnerable to attacks (e.g., Slowloris), we do nothing to
335+ -- protect the server. It is therefore vital that mkConn is well
336+ -- vetted.
337+ --
338+ -- We grab the connection before registering timeouts since the
339+ -- timeouts will be useless during connection creation, due to the
340+ -- fact that async exceptions are still masked.
341+ bracket mkConn closeConn $ \(conn, transport) ->
303342
304343 -- We need to register a timeout handler for this thread, and
305344 -- cancel that handler as soon as we exit.
306− serve unmask (conn, transport) = bracket register cancel $ \th -> do
307− -- We now have fully registered a connection close handler in
308− -- the case of all exceptions, so it is safe to once again
309− -- allow async exceptions.
310− unmask .
311− -- Call the user-supplied code for connection open and
312− -- close events
313− bracket (onOpen addr) (onClose addr) $ \goingon ->
314− -- Actually serve this connection. bracket with closeConn
315− -- above ensures the connection is closed.
316− when goingon $ serveConnection conn ii th addr transport set app
317− where
318− register = T.registerKillThread (timeoutManager ii) (connClose conn)
319− cancel = T.cancel
345+ bracket (T.registerKillThread (timeoutManager ii0)) T.cancel $ \th ->
346+
347+ let ii = ii0 { threadHandle = th }
348+ -- We now have fully registered a connection close handler
349+ -- in the case of all exceptions, so it is safe to one
350+ -- again allow async exceptions.
351+ in unmask .
352+ -- Call the user-supplied on exception code if any
353+ -- exceptions are thrown.
354+ handle (settingsOnException set Nothing) .
355+
356+ -- Call the user-supplied code for connection open and close events
357+ bracket (onOpen addr) (onClose addr) $ \goingon ->
358+
359+ -- Actually serve this connection.
360+ -- bracket with closeConn above ensures the connection is closed.
361+ when goingon $ serveConn conn ii addr transport set
362+ where
363+ closeConn (conn, _transport) = connClose conn
320364
321365 onOpen adr = increase counter >> settingsOnOpen set adr
322366 onClose adr _ = decrease counter >> settingsOnClose set adr
323367
324−serveConnection :: Connection
325− -> InternalInfo
326− -> T.Handle
327− -> SockAddr
328− -> Transport
329− -> Settings
330− -> Application
331− -> IO ()
332−serveConnection conn ii th origAddr transport settings app = do
368+-- The type of a function to serve a fully-prepared connection.
369+type ServeConnection = Connection
370+ -> InternalInfo
371+ -> SockAddr
372+ -> Transport
373+ -> Settings
374+ -> IO ()
375+
376+-- Serve an HTTP\/2-unaware Application to a connection over any HTTP version.
377+serveDefault :: Application -> ServeConnection
378+serveDefault app = serveHTTP2 (promoteApplication app) app
379+
380+-- Serve an HTTP\/2-aware application over HTTP\/2 or a backup 'Application'
381+-- over HTTP\/1.1 or HTTP\/1.
382+serveHTTP2 :: HTTP2Application -> Application -> ServeConnection
383+serveHTTP2 app2 app conn ii origAddr transport settings = do
333384 -- fixme: Upgrading to HTTP/2 should be supported.
334385 (h2,bs) <- if isHTTP2 transport then
335386 return (True, "")
@@ -339,39 +390,19 @@ serveConnection conn ii th origAddr transport settings app = do
339390 return (True, bs0)
340391 else
341392 return (False, bs0)
342− istatus <- newIORef False
343393 if settingsHTTP2Enabled settings && h2 then do
344− rawRecvN <- makeReceiveN bs (connRecv conn) (connRecvBuf conn)
345− -- This thread becomes the sender in http2 library.
346− -- In the case of event source, one request comes and one
347− -- worker gets busy. But it is likely that the receiver does
348− -- not receive any data at all while the sender is sending
349− -- output data from the worker. It's not good enough to tickle
350− -- the time handler in the receiver only. So, we should tickle
351− -- the time handler in both the receiver and the sender.
352− let recvN = wrappedRecvN th istatus (settingsSlowlorisSize settings) rawRecvN
353− sendBS x = connSendAll conn x >> T.tickle th
394+ recvN <- makeReceiveN bs (connRecv conn) (connRecvBuf conn)
354395 -- fixme: origAddr
355− checkTLS
356− setConnHTTP2 conn True
357− http2 conn transport ii origAddr settings recvN sendBS app
396+ http2 conn ii origAddr transport settings recvN app2
358397 else do
398+ istatus <- newIORef False
359399 src <- mkSource (wrappedRecv conn th istatus (settingsSlowlorisSize settings))
360400 writeIORef istatus True
361401 leftoverSource src bs
362402 addr <- getProxyProtocolAddr src
363− http1 True addr istatus src `E.catch` \e ->
364− case () of
365− ()
366− -- See comment below referencing
367− -- https://github.com/yesodweb/wai/issues/618
368− | Just NoKeepAliveRequest <- fromException e -> return ()
369− -- No valid request
370− | Just (BadFirstLine _) <- fromException e -> return ()
371− | otherwise -> do
372− _ <- sendErrorResponse (dummyreq addr) istatus e
373− throwIO e
374−
403+ http1 addr istatus src `E.catch` \e -> do
404+ sendErrorResponse addr istatus e
405+ throwIO (e :: SomeException)
375406 where
376407 getProxyProtocolAddr src =
377408 case settingsProxyProtocol settings of
@@ -413,38 +444,32 @@ serveConnection conn ii th origAddr transport settings app = do
413444
414445 decodeAscii = map (chr . fromEnum) . S.unpack
415446
447+ th = threadHandle ii
448+
416449 shouldSendErrorResponse se
417450 | Just ConnectionClosedByPeer <- fromException se = False
418451 | otherwise = True
419452
420− sendErrorResponse req istatus e = do
453+ sendErrorResponse addr istatus e = do
421454 status <- readIORef istatus
422− if shouldSendErrorResponse e && status
423− then do
424− sendResponse settings conn ii th req defaultIndexRequestHeader (return S.empty) (errorResponse e)
425− else return False
455+ when (shouldSendErrorResponse e && status) $ void $
456+ sendResponse settings conn ii (dummyreq addr) defaultIndexRequestHeader (return S.empty) (errorResponse e)
426457
427458 dummyreq addr = defaultRequest { remoteHost = addr }
428459
429460 errorResponse e = settingsOnExceptionResponse settings e
430461
431− http1 firstRequest addr istatus src = do
432− (req, mremainingRef, idxhdr, nextBodyFlush) <- recvRequest firstRequest settings conn ii th addr src transport
462+ http1 addr istatus src = do
463+ (req', mremainingRef, idxhdr, nextBodyFlush) <- recvRequest settings conn ii addr src
464+ let req = req' { isSecure = isTransportSecure transport }
433465 keepAlive <- processRequest istatus src req mremainingRef idxhdr nextBodyFlush
434466 `E.catch` \e -> do
467+ -- Call the user-supplied exception handlers, passing the request.
468+ sendErrorResponse addr istatus e
435469 settingsOnException settings (Just req) e
436470 -- Don't throw the error again to prevent calling settingsOnException twice.
437471 return False
438−
439− -- When doing a keep-alive connection, the other side may just
440− -- close the connection. We don't want to treat that as an
441− -- exceptional situation, so we pass in False to http1 (which
442− -- in turn passes in False to recvRequest), indicating that
443− -- this is not the first request. If, when trying to read the
444− -- request headers, no data is available, recvRequest will
445− -- throw a NoKeepAliveRequest exception, which we catch here
446− -- and ignore. See: https://github.com/yesodweb/wai/issues/618
447− when keepAlive $ http1 False addr istatus src
472+ when keepAlive $ http1 addr istatus src
448473
449474 processRequest istatus src req mremainingRef idxhdr nextBodyFlush = do
450475 -- Let the application run for as long as it wants
@@ -454,38 +479,30 @@ serveConnection conn ii th origAddr transport settings app = do
454479 -- creating the request, we need to make sure that we don't get
455480 -- an async exception before calling the ResponseSource.
456481 keepAliveRef <- newIORef $ error "keepAliveRef not filled"
457− r <- E.try $ app req $ \res -> do
482+ _ <- app req $ \res -> do
458483 T.resume th
459484 -- FIXME consider forcing evaluation of the res here to
460485 -- send more meaningful error messages to the user.
461486 -- However, it may affect performance.
462487 writeIORef istatus False
463− keepAlive <- sendResponse settings conn ii th req idxhdr (readSource src) res
488+ keepAlive <- sendResponse settings conn ii req idxhdr (readSource src) res
464489 writeIORef keepAliveRef keepAlive
465490 return ResponseReceived
466− case r of
467− Right ResponseReceived -> return ()
468− Left e@(SomeException _)
469− | Just (ExceptionInsideResponseBody e') <- fromException e -> throwIO e'
470− | otherwise -> do
471− keepAlive <- sendErrorResponse req istatus e
472− settingsOnException settings (Just req) e
473− writeIORef keepAliveRef keepAlive
474−
475491 keepAlive <- readIORef keepAliveRef
476492
477493 -- We just send a Response and it takes a time to
478494 -- receive a Request again. If we immediately call recv,
479− -- it is likely to fail and cause the IO manager to do some work.
480− -- It is very costly, so we yield to another Haskell
495+ -- it is likely to fail and the IO manager works.
496+ -- It is very costly. So, we yield to another Haskell
481497 -- thread hoping that the next Request will arrive
482498 -- when this Haskell thread will be re-scheduled.
483499 -- This improves performance at least when
484500 -- the number of cores is small.
485501 Conc.yield
486502
487− if keepAlive
488− then
503+ if not keepAlive then
504+ return False
505+ else
489506 -- If there is an unknown or large amount of data to still be read
490507 -- from the request body, simple drop this connection instead of
491508 -- reading it all in to satisfy a keep-alive request.
@@ -511,21 +528,6 @@ serveConnection conn ii th origAddr transport settings app = do
511528 else
512529 return False
513530 Nothing -> tryKeepAlive
514− else
515− return False
516−
517− checkTLS = case transport of
518− TCP -> return () -- direct
519− tls -> unless (tls12orLater tls) $ goaway conn H2.InadequateSecurity "Weak TLS"
520− tls12orLater tls = tlsMajorVersion tls == 3 && tlsMinorVersion tls >= 3
521−
522−-- connClose must not be called here since Run:fork calls it
523−goaway :: Connection -> H2.ErrorCodeId -> ByteString -> IO ()
524−goaway Connection{..} etype debugmsg = connSendAll bytestream
525− where
526− einfo = H2.encodeInfo id 0
527− frame = H2.GoAwayFrame 0 etype debugmsg
528− bytestream = H2.encodeFrame einfo frame
529531
530532flushEntireBody :: IO ByteString -> IO ()
531533flushEntireBody src =
@@ -558,42 +560,14 @@ wrappedRecv Connection { connRecv = recv } th istatus slowlorisSize = do
558560 when (S.length bs >= slowlorisSize) $ T.tickle th
559561 return bs
560562
561−wrappedRecvN :: T.Handle -> IORef Bool -> Int -> (BufSize -> IO ByteString) -> (BufSize -> IO ByteString)
562−wrappedRecvN th istatus slowlorisSize readN bufsize = do
563− bs <- readN bufsize
564− unless (S.null bs) $ do
565− writeIORef istatus True
566− -- TODO: think about the slowloris protection in HTTP2: current code
567− -- might open a slow-loris attack vector. Rather than timing we should
568− -- consider limiting the per-client connections assuming that in HTTP2
569− -- we should allow only few connections per host (real-world
570− -- deployments with large NATs may be trickier).
571− when (S.length bs >= slowlorisSize || bufsize <= slowlorisSize) $ T.tickle th
572− return bs
573−
574−-- | Set flag FileCloseOnExec flag on a socket (on Unix)
575−--
576563-- Copied from: https://github.com/mzero/plush/blob/master/src/Plush/Server/Warp.hs
577−--
578−-- @since 3.2.17
579564setSocketCloseOnExec :: Socket -> IO ()
580565#if WINDOWS
581566setSocketCloseOnExec _ = return ()
582567#else
583−setSocketCloseOnExec socket = do
584−#if MIN_VERSION_network(3,0,0)
585− fd <- fdSocket socket
586−#else
587− let fd = fdSocket socket
588−#endif
589− F.setFileCloseOnExec $ fromIntegral fd
568+setSocketCloseOnExec socket =
569+ setFdOption (fromIntegral $ fdSocket socket) CloseOnExec True
590570#endif
591571
592−gracefulShutdown :: Settings -> Counter -> IO ()
593−gracefulShutdown set counter =
594− case settingsGracefulShutdownTimeout set of
595− Nothing ->
596− waitForZero counter
597− (Just seconds) ->
598− void (timeout (seconds * microsPerSecond) (waitForZero counter))
599− where microsPerSecond = 1000000
572+gracefulShutdown :: Counter -> IO ()
573+gracefulShutdown counter = waitForZero counter