@@ -1,101 +1,94 @@
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 #-}
105{-# OPTIONS_GHC -fno-warn-deprecations #-}
116
127module Network.Wai.Handler.Warp.Run where
138
14−import "iproute" Data.IP (toHostAddress, toHostAddress6)
9+#if __GLASGOW_HASKELL__ < 709
10+import Control.Applicative ((<$>))
11+#endif
1512import Control.Arrow (first)
13+import Control.Concurrent (threadDelay)
1614import qualified Control.Concurrent as Conc (yield)
1715import Control.Exception as E
16+import Control.Monad (when, unless, void)
17+import Data.ByteString (ByteString)
1818import qualified Data.ByteString as S
1919import Data.Char (chr)
20+import Data.IP (toHostAddress, toHostAddress6)
2021import Data.IORef (IORef, newIORef, readIORef, writeIORef)
2122import 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
23+import Network (sClose, Socket)
24+import Network.Socket (accept, withSocketsDo, SockAddr(SockAddrInet, SockAddrInet6))
2925import qualified Network.Socket.ByteString as Sock
3026import 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−
27+import Network.Wai.HTTP2 (HTTP2Application, promoteApplication)
3628import Network.Wai.Handler.Warp.Buffer
3729import Network.Wai.Handler.Warp.Counter
3830import qualified Network.Wai.Handler.Warp.Date as D
3931import qualified Network.Wai.Handler.Warp.FdCache as F
40−import 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)
32+import Network.Wai.Handler.Warp.HTTP2 (http2, isHTTP2)
4333import Network.Wai.Handler.Warp.Header
44−import Network.Wai.Handler.Warp.Imports hiding (readInt)
4534import Network.Wai.Handler.Warp.ReadInt
4635import Network.Wai.Handler.Warp.Recv
4736import Network.Wai.Handler.Warp.Request
4837import Network.Wai.Handler.Warp.Response
4938import Network.Wai.Handler.Warp.SendFile
5039import Network.Wai.Handler.Warp.Settings
40+import qualified Network.Wai.Handler.Warp.Timeout as T
5141import Network.Wai.Handler.Warp.Types
52−
42+import Network.Wai.Internal (ResponseReceived (ResponseReceived))
43+import System.Environment (getEnvironment)
44+import System.IO.Error (isFullErrorType, ioeGetErrorType)
5345
5446#if WINDOWS
5547import Network.Wai.Handler.Warp.Windows
5648#else
49+import System.Posix.IO (FdOption(CloseOnExec), setFdOption)
5750import Network.Socket (fdSocket)
5851#endif
5952
6053-- | 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
54+socketConnection :: Socket -> IO Connection
55+socketConnection s = do
6756 bufferPool <- newBufferPool
6857 writeBuf <- allocateBuffer bufferSize
6958 let sendall = Sock.sendAll s
70− isH2 <- newIORef False -- HTTP/1.x
7159 return Connection {
7260 connSendMany = Sock.sendMany s
7361 , connSendAll = sendall
7462 , 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
63+ , connClose = sClose s >> freeBuffer writeBuf
8864 , connRecv = receive s bufferPool
8965 , connRecvBuf = receiveBuf s
9066 , connWriteBuffer = writeBuf
9167 , connBufferSize = bufferSize
92− , connHTTP2 = isH2
9368 }
9469
70+#if __GLASGOW_HASKELL__ < 702
71+allowInterrupt :: IO ()
72+allowInterrupt = unblock $ return ()
73+#endif
74+
75+-- Composition over two arguments at once; used for runHTTP2\*.
76+(.:) :: (c -> d) -> (a -> b -> c) -> a -> b -> d
77+f .: g = curry $ f . uncurry g
78+
9579-- | Run an 'Application' on the given port.
9680-- This calls 'runSettings' with 'defaultSettings'.
9781run :: Port -> Application -> IO ()
98−run p = runSettings defaultSettings { settingsPort = p }
82+run port = runServe port . serveDefault
83+
84+-- | Serve an 'HTTP2Application' and an 'Application' together on the given
85+-- port.
86+runHTTP2 :: Port -> HTTP2Application -> Application -> IO ()
87+runHTTP2 port = runServe port .: serveHTTP2
88+
89+-- | The generalized form of 'run'.
90+runServe :: Port -> ServeConnection -> IO ()
91+runServe p = runServeSettings defaultSettings { settingsPort = p }
9992
10093-- | Run an 'Application' on the port present in the @PORT@
10194-- environment variable. Uses the 'Port' given when the variable is unset.
@@ -103,28 +96,44 @@ run p = runSettings defaultSettings { settingsPort = p }
10396--
10497-- Since 3.0.9
10598runEnv :: Port -> Application -> IO ()
106−runEnv p app = do
107− mp <- lookupEnv "PORT"
99+runEnv port = runServeEnv port . serveDefault
100+
101+-- | The HTTP\/2-aware form of 'runEnv'.
102+runHTTP2Env :: Port -> HTTP2Application -> Application -> IO ()
103+runHTTP2Env port = runServeEnv port .: serveHTTP2
104+
105+-- | The generalized form of 'runEnv'.
106+runServeEnv :: Port -> ServeConnection -> IO ()
107+runServeEnv p serveConn = do
108+ mp <- lookup "PORT" <$> getEnvironment
108109
109− maybe (run p app) runReadPort mp
110+ maybe (runServe p serveConn) runReadPort mp
110111
111112 where
112113 runReadPort :: String -> IO ()
113114 runReadPort sp = case reads sp of
114− ((p', _):_) -> run p' app
115+ ((p', _):_) -> runServe p' serveConn
115116 _ -> fail $ "Invalid value in $PORT: " ++ sp
116117
117118-- | Run an 'Application' with the given 'Settings'.
118119-- This opens a listen socket on the port defined in 'Settings' and
119120-- calls 'runSettingsSocket'.
120121runSettings :: Settings -> Application -> IO ()
121−runSettings set app = withSocketsDo $
122+runSettings set = runServeSettings set . serveDefault
123+
124+-- | The HTTP\/2-aware form of 'runSettings'.
125+runHTTP2Settings :: Settings -> HTTP2Application -> Application -> IO ()
126+runHTTP2Settings set = runServeSettings set .: serveHTTP2
127+
128+-- | The generalized form of 'runSettings'.
129+runServeSettings :: Settings -> ServeConnection -> IO ()
130+runServeSettings set serveConn = withSocketsDo $
122131 bracket
123132 (bindPortTCP (settingsPort set) (settingsHost set))
124− close
133+ sClose
125134 (\socket -> do
126135 setSocketCloseOnExec socket
127− runSettingsSocket set socket app)
136+ runServeSettingsSocket set socket serveConn)
128137
129138-- | This installs a shutdown handler for the given socket and
130139-- calls 'runSettingsConnection' with the default connection setup action
@@ -138,9 +147,22 @@ runSettings set app = withSocketsDo $
138147-- Note that the 'settingsPort' will still be passed to 'Application's via the
139148-- 'serverPort' record.
140149runSettingsSocket :: Settings -> Socket -> Application -> IO ()
141−runSettingsSocket set socket app = do
150+runSettingsSocket set socket = runServeSettingsSocket set socket . serveDefault
151+
152+-- | The HTTP\/2-aware form of 'runSettingsSocket'.
153+runHTTP2SettingsSocket :: Settings
154+ -> Socket
155+ -> HTTP2Application
156+ -> Application
157+ -> IO ()
158+runHTTP2SettingsSocket set socket =
159+ runServeSettingsSocket set socket .: serveHTTP2
160+
161+-- | The generalized form of 'runSettingsSocket'.
162+runServeSettingsSocket :: Settings -> Socket -> ServeConnection -> IO ()
163+runServeSettingsSocket set socket serveConn = do
142164 settingsInstallShutdownHandler set closeListenSocket
143− runSettingsConnection set getConn app
165+ runServeSettingsConnection set getConn serveConn
144166 where
145167 getConn = do
146168#if WINDOWS
@@ -149,12 +171,10 @@ runSettingsSocket set socket app = do
149171 (s, sa) <- accept socket
150172#endif
151173 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
174+ conn <- socketConnection s
155175 return (conn, sa)
156176
157− closeListenSocket = close socket
177+ closeListenSocket = sClose socket
158178
159179-- | The connection setup action would be expensive. A good example
160180-- is initialization of TLS.
@@ -166,7 +186,16 @@ runSettingsSocket set socket app = do
166186--
167187-- Since 1.3.5
168188runSettingsConnection :: Settings -> IO (Connection, SockAddr) -> Application -> IO ()
169−runSettingsConnection set getConn app = runSettingsConnectionMaker set getConnMaker app
189+runSettingsConnection set getConn =
190+ runServeSettingsConnection set getConn . serveDefault
191+
192+-- | The generalized form of 'runSettingsConnection'.
193+runServeSettingsConnection :: Settings
194+ -> IO (Connection, SockAddr)
195+ -> ServeConnection
196+ -> IO ()
197+runServeSettingsConnection set getConn serveConn =
198+ runServeSettingsConnectionMaker set getConnMaker serveConn
170199 where
171200 getConnMaker = do
172201 (conn, sa) <- getConn
@@ -175,8 +204,16 @@ runSettingsConnection set getConn app = runSettingsConnectionMaker set getConnMa
175204-- | This modifies the connection maker so that it returns 'TCP' for 'Transport'
176205-- (i.e. plain HTTP) then calls 'runSettingsConnectionMakerSecure'.
177206runSettingsConnectionMaker :: Settings -> IO (IO Connection, SockAddr) -> Application -> IO ()
178−runSettingsConnectionMaker x y =
179− runSettingsConnectionMakerSecure x (toTCP <$> y)
207+runSettingsConnectionMaker set getConnMaker =
208+ runServeSettingsConnectionMaker set getConnMaker . serveDefault
209+
210+-- | The generalized form of 'runSettingsConnectionMaker'.
211+runServeSettingsConnectionMaker :: Settings
212+ -> IO (IO Connection, SockAddr)
213+ -> ServeConnection
214+ -> IO ()
215+runServeSettingsConnectionMaker x y =
216+ runServeSettingsConnectionMakerSecure x (toTCP <$> y)
180217 where
181218 toTCP = first ((, TCP) <$>)
182219
@@ -189,26 +226,28 @@ runSettingsConnectionMaker x y =
189226--
190227-- Since 2.1.4
191228runSettingsConnectionMakerSecure :: Settings -> IO (IO (Connection, Transport), SockAddr) -> Application -> IO ()
192−runSettingsConnectionMakerSecure set getConnMaker app = do
229+runSettingsConnectionMakerSecure set getConnMaker =
230+ runServeSettingsConnectionMakerSecure set getConnMaker . serveDefault
231+
232+-- | The generalized form of 'runSettingsConnectionMakerSecure'.
233+runServeSettingsConnectionMakerSecure :: Settings
234+ -> IO (IO (Connection, Transport), SockAddr)
235+ -> ServeConnection
236+ -> IO ()
237+runServeSettingsConnectionMakerSecure set getConnMaker serveConn = do
193238 settingsBeforeMainLoop set
194239 counter <- newCounter
195− withII $ acceptConnection set getConnMaker app counter
240+
241+ D.withDateCache $ \dc ->
242+ F.withFdCache fdCacheDurationInSeconds $ \fc ->
243+ withTimeoutManager $ \tm ->
244+ acceptConnection set getConnMaker serveConn dc fc tm counter
196245 where
197− withII action =
198− withTimeoutManager $ \tm ->
199− 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+ fdCacheDurationInSeconds = settingsFdCacheDuration set * 1000000
208247 withTimeoutManager f = case settingsManager set of
209248 Just tm -> f tm
210249 Nothing -> bracket
211− (T.initialize timeoutInSeconds)
250+ (T.initialize $ settingsTimeout set * 1000000)
212251 T.stopManager
213252 f
214253
@@ -227,21 +266,18 @@ runSettingsConnectionMakerSecure set getConnMaker app = do
227266-- Our approach is explained in the comments below.
228267acceptConnection :: Settings
229268 -> IO (IO (Connection, Transport), SockAddr)
230− -> Application
269+ -> ServeConnection
270+ -> D.DateCache
271+ -> Maybe F.MutableFdCache
272+ -> T.Manager
231273 -> Counter
232− -> InternalInfo
233274 -> IO ()
234−acceptConnection set getConnMaker app counter ii = do
275+acceptConnection set getConnMaker serveConn dc fc tm counter = do
235276 -- First mask all exceptions in acceptLoop. This is necessary to
236277 -- ensure that no async exception is throw between the call to
237278 -- acceptNewConnection and the registering of connClose.
238− --
239− -- acceptLoop can be broken by closing the listing socket.
240279 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
280+ gracefulShutdown counter
245281 where
246282 acceptLoop = do
247283 -- Allow async exceptions before receiving the next connection maker.
@@ -258,78 +294,90 @@ acceptConnection set getConnMaker app counter ii = do
258294 case mx of
259295 Nothing -> return ()
260296 Just (mkConn, addr) -> do
261− fork set mkConn addr app counter ii
297+ fork set mkConn addr serveConn dc fc tm counter
262298 acceptLoop
263299
264300 acceptNewConnection = do
265301 ex <- try getConnMaker
266302 case ex of
267303 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
304+ Left e -> do
305+ settingsOnException set Nothing $ toException e
306+ if isFullErrorType (ioeGetErrorType e) then do
307+ -- "resource exhausted (Too many open files)" may
308+ -- happen by accept(). Wait a second hoping that
309+ -- resource will be available.
310+ threadDelay 1000000
311+ acceptNewConnection
312+ else
313+ -- Assuming the listen socket is closed.
314+ return Nothing
276315
277316-- Fork a new worker thread for this connection maker, and ask for a
278317-- function to unmask (i.e., allow async exceptions to be thrown).
279318fork :: Settings
280319 -> IO (Connection, Transport)
281320 -> SockAddr
282− -> Application
321+ -> ServeConnection
322+ -> D.DateCache
323+ -> Maybe F.MutableFdCache
324+ -> T.Manager
283325 -> Counter
284− -> InternalInfo
285326 -> 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
327+fork set mkConn addr serveConn dc fc tm counter = settingsFork set $ \ unmask ->
328+ -- Run the connection maker to get a new connection, and ensure
329+ -- that the connection is closed. If the mkConn call throws an
330+ -- exception, we will leak the connection. If the mkConn call is
331+ -- vulnerable to attacks (e.g., Slowloris), we do nothing to
332+ -- protect the server. It is therefore vital that mkConn is well
333+ -- vetted.
334+ --
335+ -- We grab the connection before registering timeouts since the
336+ -- timeouts will be useless during connection creation, due to the
337+ -- fact that async exceptions are still masked.
338+ bracket mkConn closeConn $ \(conn, transport) ->
303339
304340 -- We need to register a timeout handler for this thread, and
305341 -- 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
342+ bracket (T.registerKillThread tm) T.cancel $ \th ->
343+
344+ let ii = InternalInfo th tm fc dc
345+ -- We now have fully registered a connection close handler
346+ -- in the case of all exceptions, so it is safe to one
347+ -- again allow async exceptions.
348+ in unmask .
349+ -- Call the user-supplied on exception code if any
350+ -- exceptions are thrown.
351+ handle (settingsOnException set Nothing) .
352+
353+ -- Call the user-supplied code for connection open and close events
354+ bracket (onOpen addr) (onClose addr) $ \goingon ->
355+
356+ -- Actually serve this connection.
357+ -- bracket with closeConn above ensures the connection is closed.
358+ when goingon $ serveConn conn ii addr transport set
359+ where
360+ closeConn (conn, _transport) = connClose conn
320361
321362 onOpen adr = increase counter >> settingsOnOpen set adr
322363 onClose adr _ = decrease counter >> settingsOnClose set adr
323364
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
365+-- The type of a function to serve a fully-prepared connection.
366+type ServeConnection = Connection
367+ -> InternalInfo
368+ -> SockAddr
369+ -> Transport
370+ -> Settings
371+ -> IO ()
372+
373+-- Serve an HTTP\/2-unaware Application to a connection over any HTTP version.
374+serveDefault :: Application -> ServeConnection
375+serveDefault app = serveHTTP2 (promoteApplication app) app
376+
377+-- Serve an HTTP\/2-aware application over HTTP\/2 or a backup 'Application'
378+-- over HTTP\/1.1 or HTTP\/1.
379+serveHTTP2 :: HTTP2Application -> Application -> ServeConnection
380+serveHTTP2 app2 app conn ii origAddr transport settings = do
333381 -- fixme: Upgrading to HTTP/2 should be supported.
334382 (h2,bs) <- if isHTTP2 transport then
335383 return (True, "")
@@ -339,39 +387,19 @@ serveConnection conn ii th origAddr transport settings app = do
339387 return (True, bs0)
340388 else
341389 return (False, bs0)
342− istatus <- newIORef False
343390 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
391+ recvN <- makeReceiveN bs (connRecv conn) (connRecvBuf conn)
354392 -- fixme: origAddr
355− checkTLS
356− setConnHTTP2 conn True
357− http2 conn transport ii origAddr settings recvN sendBS app
393+ http2 conn ii origAddr transport settings recvN app2
358394 else do
395+ istatus <- newIORef False
359396 src <- mkSource (wrappedRecv conn th istatus (settingsSlowlorisSize settings))
360397 writeIORef istatus True
361398 leftoverSource src bs
362399 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−
400+ http1 addr istatus src `E.catch` \e -> do
401+ sendErrorResponse addr istatus e
402+ throwIO (e :: SomeException)
375403 where
376404 getProxyProtocolAddr src =
377405 case settingsProxyProtocol settings of
@@ -413,38 +441,30 @@ serveConnection conn ii th origAddr transport settings app = do
413441
414442 decodeAscii = map (chr . fromEnum) . S.unpack
415443
416− shouldSendErrorResponse se
417− | Just ConnectionClosedByPeer <- fromException se = False
418− | otherwise = True
444+ th = threadHandle ii
419445
420− sendErrorResponse req istatus e = do
446+ sendErrorResponse addr istatus e = do
421447 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
448+ when status $ void $
449+ sendResponse
450+ (settingsServerName settings)
451+ conn ii (dummyreq addr) defaultIndexRequestHeader (return S.empty) (errorResponse e)
426452
427453 dummyreq addr = defaultRequest { remoteHost = addr }
428454
429455 errorResponse e = settingsOnExceptionResponse settings e
430456
431− http1 firstRequest addr istatus src = do
432− (req, mremainingRef, idxhdr, nextBodyFlush) <- recvRequest firstRequest settings conn ii th addr src transport
457+ http1 addr istatus src = do
458+ (req', mremainingRef, idxhdr, nextBodyFlush) <- recvRequest settings conn ii addr src
459+ let req = req' { isSecure = isTransportSecure transport }
433460 keepAlive <- processRequest istatus src req mremainingRef idxhdr nextBodyFlush
434461 `E.catch` \e -> do
462+ -- Call the user-supplied exception handlers, passing the request.
463+ sendErrorResponse addr istatus e
435464 settingsOnException settings (Just req) e
436465 -- Don't throw the error again to prevent calling settingsOnException twice.
437466 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
467+ when keepAlive $ http1 addr istatus src
448468
449469 processRequest istatus src req mremainingRef idxhdr nextBodyFlush = do
450470 -- Let the application run for as long as it wants
@@ -454,38 +474,32 @@ serveConnection conn ii th origAddr transport settings app = do
454474 -- creating the request, we need to make sure that we don't get
455475 -- an async exception before calling the ResponseSource.
456476 keepAliveRef <- newIORef $ error "keepAliveRef not filled"
457− r <- E.try $ app req $ \res -> do
477+ _ <- app req $ \res -> do
458478 T.resume th
459479 -- FIXME consider forcing evaluation of the res here to
460480 -- send more meaningful error messages to the user.
461481 -- However, it may affect performance.
462482 writeIORef istatus False
463− keepAlive <- sendResponse settings conn ii th req idxhdr (readSource src) res
483+ keepAlive <- sendResponse
484+ (settingsServerName settings)
485+ conn ii req idxhdr (readSource src) res
464486 writeIORef keepAliveRef keepAlive
465487 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−
475488 keepAlive <- readIORef keepAliveRef
476489
477490 -- We just send a Response and it takes a time to
478491 -- 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
492+ -- it is likely to fail and the IO manager works.
493+ -- It is very costly. So, we yield to another Haskell
481494 -- thread hoping that the next Request will arrive
482495 -- when this Haskell thread will be re-scheduled.
483496 -- This improves performance at least when
484497 -- the number of cores is small.
485498 Conc.yield
486499
487− if keepAlive
488− then
500+ if not keepAlive then
501+ return False
502+ else
489503 -- If there is an unknown or large amount of data to still be read
490504 -- from the request body, simple drop this connection instead of
491505 -- reading it all in to satisfy a keep-alive request.
@@ -511,21 +525,6 @@ serveConnection conn ii th origAddr transport settings app = do
511525 else
512526 return False
513527 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
529528
530529flushEntireBody :: IO ByteString -> IO ()
531530flushEntireBody src =
@@ -558,42 +557,14 @@ wrappedRecv Connection { connRecv = recv } th istatus slowlorisSize = do
558557 when (S.length bs >= slowlorisSize) $ T.tickle th
559558 return bs
560559
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−--
576560-- Copied from: https://github.com/mzero/plush/blob/master/src/Plush/Server/Warp.hs
577−--
578−-- @since 3.2.17
579561setSocketCloseOnExec :: Socket -> IO ()
580562#if WINDOWS
581563setSocketCloseOnExec _ = return ()
582564#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
565+setSocketCloseOnExec socket =
566+ setFdOption (fromIntegral $ fdSocket socket) CloseOnExec True
590567#endif
591568
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
569+gracefulShutdown :: Counter -> IO ()
570+gracefulShutdown counter = waitForZero counter