@@ -1,101 +1,86 @@
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)
159import Control.Arrow (first)
10+import Control.Concurrent (threadDelay)
1611import qualified Control.Concurrent as Conc (yield)
1712import Control.Exception as E
13+import Control.Monad (when, unless, void)
14+import Data.ByteString (ByteString)
1815import qualified Data.ByteString as S
1916import Data.Char (chr)
17+import Data.IP (toHostAddress, toHostAddress6)
2018import Data.IORef (IORef, newIORef, readIORef, writeIORef)
2119import 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
20+import Network (sClose, Socket)
21+import Network.Socket (accept, withSocketsDo, SockAddr(SockAddrInet, SockAddrInet6))
2922import qualified Network.Socket.ByteString as Sock
3023import 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−
24+import Network.Wai.HTTP2 (Http2Application)
3625import Network.Wai.Handler.Warp.Buffer
3726import Network.Wai.Handler.Warp.Counter
3827import qualified Network.Wai.Handler.Warp.Date as D
3928import 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)
29+import Network.Wai.Handler.Warp.HTTP2 (http2, isHTTP2, promoteApplication)
4330import Network.Wai.Handler.Warp.Header
44−import Network.Wai.Handler.Warp.Imports hiding (readInt)
4531import Network.Wai.Handler.Warp.ReadInt
4632import Network.Wai.Handler.Warp.Recv
4733import Network.Wai.Handler.Warp.Request
4834import Network.Wai.Handler.Warp.Response
4935import Network.Wai.Handler.Warp.SendFile
5036import Network.Wai.Handler.Warp.Settings
37+import qualified Network.Wai.Handler.Warp.Timeout as T
5138import Network.Wai.Handler.Warp.Types
52−
39+import Network.Wai.Internal (ResponseReceived (ResponseReceived))
40+import System.Environment (getEnvironment)
41+import System.IO.Error (isFullErrorType, ioeGetErrorType)
5342
5443#if WINDOWS
5544import Network.Wai.Handler.Warp.Windows
5645#else
46+import System.Posix.IO (FdOption(CloseOnExec), setFdOption)
5747import Network.Socket (fdSocket)
5848#endif
5949
6050-- | 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
51+socketConnection :: Socket -> IO Connection
52+socketConnection s = do
6753 bufferPool <- newBufferPool
6854 writeBuf <- allocateBuffer bufferSize
6955 let sendall = Sock.sendAll s
70− isH2 <- newIORef False -- HTTP/1.x
7156 return Connection {
7257 connSendMany = Sock.sendMany s
7358 , connSendAll = sendall
7459 , 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
60+ , connClose = sClose s >> freeBuffer writeBuf
8861 , connRecv = receive s bufferPool
8962 , connRecvBuf = receiveBuf s
9063 , connWriteBuffer = writeBuf
9164 , connBufferSize = bufferSize
92− , connHTTP2 = isH2
9365 }
9466
67+#if __GLASGOW_HASKELL__ < 702
68+allowInterrupt :: IO ()
69+allowInterrupt = unblock $ return ()
70+#endif
71+
72+-- Used to duplicate the 'app' argument for all of the non-HTTP2 variants.
73+runWithPromotedApp :: (Http2Application -> Application -> a) -> Application -> a
74+runWithPromotedApp f = flip f <*> promoteApplication
75+
9576-- | Run an 'Application' on the given port.
9677-- This calls 'runSettings' with 'defaultSettings'.
9778run :: Port -> Application -> IO ()
98−run p = runSettings defaultSettings { settingsPort = p }
79+run = runWithPromotedApp . runHttp2
80+
81+-- | The HTTP/2-aware eqivalent of 'run'.
82+runHttp2 :: Port -> Http2Application -> Application -> IO ()
83+runHttp2 p = runHttp2Settings defaultSettings { settingsPort = p }
9984
10085-- | Run an 'Application' on the port present in the @PORT@
10186-- environment variable. Uses the 'Port' given when the variable is unset.
@@ -103,28 +88,36 @@ run p = runSettings defaultSettings { settingsPort = p }
10388--
10489-- Since 3.0.9
10590runEnv :: Port -> Application -> IO ()
106−runEnv p app = do
107− mp <- lookupEnv "PORT"
91+runEnv = runWithPromotedApp . runHttp2Env
92+
93+-- | The HTTP/2-aware eqivalent of 'runEnv'.
94+runHttp2Env :: Port -> Http2Application -> Application -> IO ()
95+runHttp2Env p app2 app = do
96+ mp <- fmap (lookup "PORT") getEnvironment
10897
10998 maybe (run p app) runReadPort mp
11099
111100 where
112101 runReadPort :: String -> IO ()
113102 runReadPort sp = case reads sp of
114− ((p', _):_) -> run p' app
103+ ((p', _):_) -> runHttp2 p' app2 app
115104 _ -> fail $ "Invalid value in $PORT: " ++ sp
116105
117106-- | Run an 'Application' with the given 'Settings'.
118107-- This opens a listen socket on the port defined in 'Settings' and
119108-- calls 'runSettingsSocket'.
120109runSettings :: Settings -> Application -> IO ()
121−runSettings set app = withSocketsDo $
110+runSettings = runWithPromotedApp . runHttp2Settings
111+
112+-- | The HTTP/2-aware eqivalent of 'runSettings'.
113+runHttp2Settings :: Settings -> Http2Application -> Application -> IO ()
114+runHttp2Settings set app2 app = withSocketsDo $
122115 bracket
123116 (bindPortTCP (settingsPort set) (settingsHost set))
124− close
117+ sClose
125118 (\socket -> do
126119 setSocketCloseOnExec socket
127− runSettingsSocket set socket app)
120+ runHttp2SettingsSocket set socket app2 app)
128121
129122-- | This installs a shutdown handler for the given socket and
130123-- calls 'runSettingsConnection' with the default connection setup action
@@ -138,9 +131,14 @@ runSettings set app = withSocketsDo $
138131-- Note that the 'settingsPort' will still be passed to 'Application's via the
139132-- 'serverPort' record.
140133runSettingsSocket :: Settings -> Socket -> Application -> IO ()
141−runSettingsSocket set socket app = do
134+runSettingsSocket set socket = runWithPromotedApp $
135+ runHttp2SettingsSocket set socket
136+
137+-- | The HTTP/2-aware eqivalent of 'runSettingsSocket'.
138+runHttp2SettingsSocket :: Settings -> Socket -> Http2Application -> Application -> IO ()
139+runHttp2SettingsSocket set socket app2 app = do
142140 settingsInstallShutdownHandler set closeListenSocket
143− runSettingsConnection set getConn app
141+ runHttp2SettingsConnection set getConn app2 app
144142 where
145143 getConn = do
146144#if WINDOWS
@@ -149,12 +147,10 @@ runSettingsSocket set socket app = do
149147 (s, sa) <- accept socket
150148#endif
151149 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
150+ conn <- socketConnection s
155151 return (conn, sa)
156152
157− closeListenSocket = close socket
153+ closeListenSocket = sClose socket
158154
159155-- | The connection setup action would be expensive. A good example
160156-- is initialization of TLS.
@@ -166,7 +162,13 @@ runSettingsSocket set socket app = do
166162--
167163-- Since 1.3.5
168164runSettingsConnection :: Settings -> IO (Connection, SockAddr) -> Application -> IO ()
169−runSettingsConnection set getConn app = runSettingsConnectionMaker set getConnMaker app
165+runSettingsConnection set getConn = runWithPromotedApp $
166+ runHttp2SettingsConnection set getConn
167+
168+-- | The HTTP/2-aware eqivalent of 'runSettingsConnection'.
169+runHttp2SettingsConnection :: Settings -> IO (Connection, SockAddr) -> Http2Application -> Application -> IO ()
170+runHttp2SettingsConnection set getConn app2 app =
171+ runHttp2SettingsConnectionMaker set getConnMaker app2 app
170172 where
171173 getConnMaker = do
172174 (conn, sa) <- getConn
@@ -175,10 +177,15 @@ runSettingsConnection set getConn app = runSettingsConnectionMaker set getConnMa
175177-- | This modifies the connection maker so that it returns 'TCP' for 'Transport'
176178-- (i.e. plain HTTP) then calls 'runSettingsConnectionMakerSecure'.
177179runSettingsConnectionMaker :: Settings -> IO (IO Connection, SockAddr) -> Application -> IO ()
178−runSettingsConnectionMaker x y =
179− runSettingsConnectionMakerSecure x (toTCP <$> y)
180+runSettingsConnectionMaker x y = runWithPromotedApp $
181+ runHttp2SettingsConnectionMaker x y
182+
183+-- | The HTTP/2-aware eqivalent of 'runSettingsConnectionMaker'.
184+runHttp2SettingsConnectionMaker :: Settings -> IO (IO Connection, SockAddr) -> Http2Application -> Application -> IO ()
185+runHttp2SettingsConnectionMaker x y =
186+ runHttp2SettingsConnectionMakerSecure x (go y)
180187 where
181− toTCP = first ((, TCP) <$>)
188+ go = fmap (first (fmap (, TCP)))
182189
183190----------------------------------------------------------------
184191
@@ -189,26 +196,25 @@ runSettingsConnectionMaker x y =
189196--
190197-- Since 2.1.4
191198runSettingsConnectionMakerSecure :: Settings -> IO (IO (Connection, Transport), SockAddr) -> Application -> IO ()
192−runSettingsConnectionMakerSecure set getConnMaker app = do
199+runSettingsConnectionMakerSecure set getConnMaker = runWithPromotedApp $
200+ runHttp2SettingsConnectionMakerSecure set getConnMaker
201+
202+-- | The HTTP/2-aware eqivalent of 'runSettingsConnectionMakerSecure'.
203+runHttp2SettingsConnectionMakerSecure :: Settings -> IO (IO (Connection, Transport), SockAddr) -> Http2Application -> Application -> IO ()
204+runHttp2SettingsConnectionMakerSecure set getConnMaker app2 app = do
193205 settingsBeforeMainLoop set
194206 counter <- newCounter
195− withII $ acceptConnection set getConnMaker app counter
207+
208+ D.withDateCache $ \dc ->
209+ F.withFdCache fdCacheDurationInSeconds $ \fc ->
210+ withTimeoutManager $ \tm ->
211+ acceptConnection set getConnMaker app2 app dc fc tm counter
196212 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
213+ fdCacheDurationInSeconds = settingsFdCacheDuration set * 1000000
208214 withTimeoutManager f = case settingsManager set of
209215 Just tm -> f tm
210216 Nothing -> bracket
211− (T.initialize timeoutInSeconds)
217+ (T.initialize $ settingsTimeout set * 1000000)
212218 T.stopManager
213219 f
214220
@@ -227,21 +233,19 @@ runSettingsConnectionMakerSecure set getConnMaker app = do
227233-- Our approach is explained in the comments below.
228234acceptConnection :: Settings
229235 -> IO (IO (Connection, Transport), SockAddr)
236+ -> Http2Application
230237 -> Application
238+ -> D.DateCache
239+ -> Maybe F.MutableFdCache
240+ -> T.Manager
231241 -> Counter
232− -> InternalInfo
233242 -> IO ()
234−acceptConnection set getConnMaker app counter ii = do
243+acceptConnection set getConnMaker app2 app dc fc tm counter = do
235244 -- First mask all exceptions in acceptLoop. This is necessary to
236245 -- ensure that no async exception is throw between the call to
237246 -- acceptNewConnection and the registering of connClose.
238− --
239− -- acceptLoop can be broken by closing the listing socket.
240247 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
248+ gracefulShutdown counter
245249 where
246250 acceptLoop = do
247251 -- Allow async exceptions before receiving the next connection maker.
@@ -258,78 +262,84 @@ acceptConnection set getConnMaker app counter ii = do
258262 case mx of
259263 Nothing -> return ()
260264 Just (mkConn, addr) -> do
261− fork set mkConn addr app counter ii
265+ fork set mkConn addr app2 app dc fc tm counter
262266 acceptLoop
263267
264268 acceptNewConnection = do
265269 ex <- try getConnMaker
266270 case ex of
267271 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
272+ Left e -> do
273+ settingsOnException set Nothing $ toException e
274+ if isFullErrorType (ioeGetErrorType e) then do
275+ -- "resource exhausted (Too many open files)" may
276+ -- happen by accept(). Wait a second hoping that
277+ -- resource will be available.
278+ threadDelay 1000000
279+ acceptNewConnection
280+ else
281+ -- Assuming the listen socket is closed.
282+ return Nothing
276283
277284-- Fork a new worker thread for this connection maker, and ask for a
278285-- function to unmask (i.e., allow async exceptions to be thrown).
279286fork :: Settings
280287 -> IO (Connection, Transport)
281288 -> SockAddr
289+ -> Http2Application
282290 -> Application
291+ -> D.DateCache
292+ -> Maybe F.MutableFdCache
293+ -> T.Manager
283294 -> Counter
284− -> InternalInfo
285295 -> 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
296+fork set mkConn addr app2 app dc fc tm counter = settingsFork set $ \ unmask ->
297+ -- Run the connection maker to get a new connection, and ensure
298+ -- that the connection is closed. If the mkConn call throws an
299+ -- exception, we will leak the connection. If the mkConn call is
300+ -- vulnerable to attacks (e.g., Slowloris), we do nothing to
301+ -- protect the server. It is therefore vital that mkConn is well
302+ -- vetted.
303+ --
304+ -- We grab the connection before registering timeouts since the
305+ -- timeouts will be useless during connection creation, due to the
306+ -- fact that async exceptions are still masked.
307+ bracket mkConn closeConn $ \(conn, transport) ->
303308
304309 -- We need to register a timeout handler for this thread, and
305310 -- 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
311+ bracket (T.registerKillThread tm) T.cancel $ \th ->
312+
313+ let ii = InternalInfo th tm fc dc
314+ -- We now have fully registered a connection close handler
315+ -- in the case of all exceptions, so it is safe to one
316+ -- again allow async exceptions.
317+ in unmask .
318+ -- Call the user-supplied on exception code if any
319+ -- exceptions are thrown.
320+ handle (settingsOnException set Nothing) .
321+
322+ -- Call the user-supplied code for connection open and close events
323+ bracket (onOpen addr) (onClose addr) $ \goingon ->
324+
325+ -- Actually serve this connection.
326+ -- bracket with closeConn above ensures the connection is closed.
327+ when goingon $ serveConnection conn ii addr transport set app2 app
328+ where
329+ closeConn (conn, _transport) = connClose conn
320330
321331 onOpen adr = increase counter >> settingsOnOpen set adr
322332 onClose adr _ = decrease counter >> settingsOnClose set adr
323333
324334serveConnection :: Connection
325335 -> InternalInfo
326− -> T.Handle
327336 -> SockAddr
328337 -> Transport
329338 -> Settings
339+ -> Http2Application
330340 -> Application
331341 -> IO ()
332−serveConnection conn ii th origAddr transport settings app = do
342+serveConnection conn ii origAddr transport settings app2 app = do
333343 -- fixme: Upgrading to HTTP/2 should be supported.
334344 (h2,bs) <- if isHTTP2 transport then
335345 return (True, "")
@@ -339,39 +349,19 @@ serveConnection conn ii th origAddr transport settings app = do
339349 return (True, bs0)
340350 else
341351 return (False, bs0)
342− istatus <- newIORef False
343− 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
352+ if h2 then do
353+ recvN <- makeReceiveN bs (connRecv conn) (connRecvBuf conn)
354354 -- fixme: origAddr
355− checkTLS
356− setConnHTTP2 conn True
357− http2 conn transport ii origAddr settings recvN sendBS app
355+ http2 conn ii origAddr transport settings recvN app2
358356 else do
357+ istatus <- newIORef False
359358 src <- mkSource (wrappedRecv conn th istatus (settingsSlowlorisSize settings))
360359 writeIORef istatus True
361360 leftoverSource src bs
362361 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−
362+ http1 addr istatus src `E.catch` \e -> do
363+ sendErrorResponse addr istatus e
364+ throwIO (e :: SomeException)
375365 where
376366 getProxyProtocolAddr src =
377367 case settingsProxyProtocol settings of
@@ -413,38 +403,30 @@ serveConnection conn ii th origAddr transport settings app = do
413403
414404 decodeAscii = map (chr . fromEnum) . S.unpack
415405
416− shouldSendErrorResponse se
417− | Just ConnectionClosedByPeer <- fromException se = False
418− | otherwise = True
406+ th = threadHandle ii
419407
420− sendErrorResponse req istatus e = do
408+ sendErrorResponse addr istatus e = do
421409 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
410+ when status $ void $
411+ sendResponse
412+ (settingsServerName settings)
413+ conn ii (dummyreq addr) defaultIndexRequestHeader (return S.empty) (errorResponse e)
426414
427415 dummyreq addr = defaultRequest { remoteHost = addr }
428416
429417 errorResponse e = settingsOnExceptionResponse settings e
430418
431− http1 firstRequest addr istatus src = do
432− (req, mremainingRef, idxhdr, nextBodyFlush) <- recvRequest firstRequest settings conn ii th addr src transport
419+ http1 addr istatus src = do
420+ (req', mremainingRef, idxhdr, nextBodyFlush) <- recvRequest settings conn ii addr src
421+ let req = req' { isSecure = isTransportSecure transport }
433422 keepAlive <- processRequest istatus src req mremainingRef idxhdr nextBodyFlush
434423 `E.catch` \e -> do
424+ -- Call the user-supplied exception handlers, passing the request.
425+ sendErrorResponse addr istatus e
435426 settingsOnException settings (Just req) e
436427 -- Don't throw the error again to prevent calling settingsOnException twice.
437428 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
429+ when keepAlive $ http1 addr istatus src
448430
449431 processRequest istatus src req mremainingRef idxhdr nextBodyFlush = do
450432 -- Let the application run for as long as it wants
@@ -454,38 +436,32 @@ serveConnection conn ii th origAddr transport settings app = do
454436 -- creating the request, we need to make sure that we don't get
455437 -- an async exception before calling the ResponseSource.
456438 keepAliveRef <- newIORef $ error "keepAliveRef not filled"
457− r <- E.try $ app req $ \res -> do
439+ _ <- app req $ \res -> do
458440 T.resume th
459441 -- FIXME consider forcing evaluation of the res here to
460442 -- send more meaningful error messages to the user.
461443 -- However, it may affect performance.
462444 writeIORef istatus False
463− keepAlive <- sendResponse settings conn ii th req idxhdr (readSource src) res
445+ keepAlive <- sendResponse
446+ (settingsServerName settings)
447+ conn ii req idxhdr (readSource src) res
464448 writeIORef keepAliveRef keepAlive
465449 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−
475450 keepAlive <- readIORef keepAliveRef
476451
477452 -- We just send a Response and it takes a time to
478453 -- 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
454+ -- it is likely to fail and the IO manager works.
455+ -- It is very costly. So, we yield to another Haskell
481456 -- thread hoping that the next Request will arrive
482457 -- when this Haskell thread will be re-scheduled.
483458 -- This improves performance at least when
484459 -- the number of cores is small.
485460 Conc.yield
486461
487− if keepAlive
488− then
462+ if not keepAlive then
463+ return False
464+ else
489465 -- If there is an unknown or large amount of data to still be read
490466 -- from the request body, simple drop this connection instead of
491467 -- reading it all in to satisfy a keep-alive request.
@@ -511,21 +487,6 @@ serveConnection conn ii th origAddr transport settings app = do
511487 else
512488 return False
513489 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
529490
530491flushEntireBody :: IO ByteString -> IO ()
531492flushEntireBody src =
@@ -558,42 +519,14 @@ wrappedRecv Connection { connRecv = recv } th istatus slowlorisSize = do
558519 when (S.length bs >= slowlorisSize) $ T.tickle th
559520 return bs
560521
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−--
576522-- Copied from: https://github.com/mzero/plush/blob/master/src/Plush/Server/Warp.hs
577−--
578−-- @since 3.2.17
579523setSocketCloseOnExec :: Socket -> IO ()
580524#if WINDOWS
581525setSocketCloseOnExec _ = return ()
582526#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
527+setSocketCloseOnExec socket =
528+ setFdOption (fromIntegral $ fdSocket socket) CloseOnExec True
590529#endif
591530
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
531+gracefulShutdown :: Counter -> IO ()
532+gracefulShutdown counter = waitForZero counter