@@ -1,142 +1,106 @@
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−
3624import Network.Wai.Handler.Warp.Buffer
3725import Network.Wai.Handler.Warp.Counter
3826import qualified Network.Wai.Handler.Warp.Date as D
3927import 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)
4328import Network.Wai.Handler.Warp.Header
44−import Network.Wai.Handler.Warp.Imports hiding (readInt)
4529import Network.Wai.Handler.Warp.ReadInt
4630import Network.Wai.Handler.Warp.Recv
4731import Network.Wai.Handler.Warp.Request
4832import Network.Wai.Handler.Warp.Response
4933import Network.Wai.Handler.Warp.SendFile
5034import Network.Wai.Handler.Warp.Settings
35+import qualified Network.Wai.Handler.Warp.Timeout as T
5136import Network.Wai.Handler.Warp.Types
52−
37+import Network.Wai.Internal (ResponseReceived (ResponseReceived))
38+import System.Environment (getEnvironment)
39+import System.IO.Error (isFullErrorType, ioeGetErrorType)
5340
5441#if WINDOWS
5542import Network.Wai.Handler.Warp.Windows
5643#else
44+import System.Posix.IO (FdOption(CloseOnExec), setFdOption)
5745import Network.Socket (fdSocket)
5846#endif
5947
60−-- | 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
67− bufferPool <- newBufferPool
48+-- | Default action value for 'Connection'.
49+socketConnection :: Socket -> IO Connection
50+socketConnection s = do
51+ readBuf <- allocateBuffer bufferSize
6852 writeBuf <- allocateBuffer bufferSize
69− let sendall = Sock.sendAll s
70− isH2 <- newIORef False -- HTTP/1.x
7153 return Connection {
7254 connSendMany = Sock.sendMany s
73− , connSendAll = sendall
74− , 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
88− , connRecv = receive s bufferPool
89− , connRecvBuf = receiveBuf s
55+ , connSendAll = Sock.sendAll s
56+ , connSendFile = defaultSendFile s
57+ , connClose = sClose s >> freeBuffer readBuf >> freeBuffer writeBuf
58+ , connRecv = receive s readBuf bufferSize
59+ , connReadBuffer = readBuf
9060 , connWriteBuffer = writeBuf
9161 , connBufferSize = bufferSize
92− , connHTTP2 = isH2
62+ , connSendFileOverride = Override s
9363 }
9464
95−-- | Run an 'Application' on the given port.
96−-- This calls 'runSettings' with 'defaultSettings'.
65+#if __GLASGOW_HASKELL__ < 702
66+allowInterrupt :: IO ()
67+allowInterrupt = unblock $ return ()
68+#endif
69+
70+-- | Run an 'Application' on the given port. This calls 'runSettings' with
71+-- 'defaultSettings'.
9772run :: Port -> Application -> IO ()
9873run p = runSettings defaultSettings { settingsPort = p }
9974
100−-- | Run an 'Application' on the port present in the @PORT@
101−-- environment variable. Uses the 'Port' given when the variable is unset.
102−-- This calls 'runSettings' with 'defaultSettings'.
75+-- | Run an 'Application' on the port present in the @PORT@ environment variable
10376--
104−-- Since 3.0.9
77+-- Uses the 'Port' given when the variable is unset.
78+--
79+-- Since X.Y.Z
10580runEnv :: Port -> Application -> IO ()
10681runEnv p app = do
107− mp <- lookupEnv "PORT"
108−
109− maybe (run p app) runReadPort mp
110−
111− where
112− runReadPort :: String -> IO ()
113− runReadPort sp = case reads sp of
114− ((p', _):_) -> run p' app
115− _ -> fail $ "Invalid value in $PORT: " ++ sp
82+ mp <- fmap (lookup "PORT") getEnvironment
83+ run (maybe p read mp) app
11684
11785-- | Run an 'Application' with the given 'Settings'.
118−-- This opens a listen socket on the port defined in 'Settings' and
119−-- calls 'runSettingsSocket'.
12086runSettings :: Settings -> Application -> IO ()
12187runSettings set app = withSocketsDo $
12288 bracket
12389 (bindPortTCP (settingsPort set) (settingsHost set))
124− close
90+ sClose
12591 (\socket -> do
12692 setSocketCloseOnExec socket
12793 runSettingsSocket set socket app)
12894
129−-- | This installs a shutdown handler for the given socket and
130−-- calls 'runSettingsConnection' with the default connection setup action
131−-- which handles plain (non-cipher) HTTP.
132−-- When the listen socket in the second argument is closed, all live
133−-- connections are gracefully shut down.
134−--
135−-- The supplied socket can be a Unix named socket, which
95+-- | Same as 'runSettings', but uses a user-supplied socket instead of opening
96+-- one. This allows the user to provide, for example, Unix named socket, which
13697-- can be used when reverse HTTP proxying into your application.
13798--
13899-- Note that the 'settingsPort' will still be passed to 'Application's via the
139100-- 'serverPort' record.
101+--
102+-- When the listen socket in the second argument is closed, all live
103+-- connections are gracefully shut down.
140104runSettingsSocket :: Settings -> Socket -> Application -> IO ()
141105runSettingsSocket set socket app = do
142106 settingsInstallShutdownHandler set closeListenSocket
@@ -149,20 +113,15 @@ runSettingsSocket set socket app = do
149113 (s, sa) <- accept socket
150114#endif
151115 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
116+ conn <- socketConnection s
155117 return (conn, sa)
156118
157− closeListenSocket = close socket
119+ closeListenSocket = sClose socket
158120
159−-- | The connection setup action would be expensive. A good example
160−-- is initialization of TLS.
161−-- So, this converts the connection setup action to the connection maker
162−-- which will be executed after forking a new worker thread.
163−-- Then this calls 'runSettingsConnectionMaker' with the connection maker.
164−-- This allows the expensive computations to be performed
165−-- in a separate worker thread instead of the main server loop.
121+-- | Allows you to provide a function which will return a 'Connection'. In
122+-- cases where creating the @Connection@ can be expensive, this allows the
123+-- expensive computations to be performed in a separate thread instead of the
124+-- main server loop.
166125--
167126-- Since 1.3.5
168127runSettingsConnection :: Settings -> IO (Connection, SockAddr) -> Application -> IO ()
@@ -172,46 +131,41 @@ runSettingsConnection set getConn app = runSettingsConnectionMaker set getConnMa
172131 (conn, sa) <- getConn
173132 return (return conn, sa)
174133
175−-- | This modifies the connection maker so that it returns 'TCP' for 'Transport'
176−-- (i.e. plain HTTP) then calls 'runSettingsConnectionMakerSecure'.
177134runSettingsConnectionMaker :: Settings -> IO (IO Connection, SockAddr) -> Application -> IO ()
178135runSettingsConnectionMaker x y =
179− runSettingsConnectionMakerSecure x (toTCP <$> y)
136+ runSettingsConnectionMakerSecure x (go y)
180137 where
181− toTCP = first ((, TCP) <$>)
138+ go = fmap (first (fmap (, TCP)))
182139
183140----------------------------------------------------------------
184141
185−-- | The core run function which takes 'Settings',
186−-- a connection maker and 'Application'.
187−-- The connection maker can return a connection of either plain HTTP
188−-- or HTTP over TLS.
142+-- | Allows you to provide a function which will return a function
143+-- which will return 'Connection'.
189144--
190145-- Since 2.1.4
191146runSettingsConnectionMakerSecure :: Settings -> IO (IO (Connection, Transport), SockAddr) -> Application -> IO ()
192147runSettingsConnectionMakerSecure set getConnMaker app = do
193148 settingsBeforeMainLoop set
194149 counter <- newCounter
195− withII $ acceptConnection set getConnMaker app counter
150+
151+ D.withDateCache $ \dc ->
152+ F.withFdCache fdCacheDurationInSeconds $ \fc ->
153+ withTimeoutManager $ \tm ->
154+ acceptConnection set getConnMaker app dc fc tm counter
196155 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
156+ fdCacheDurationInSeconds = settingsFdCacheDuration set * 1000000
208157 withTimeoutManager f = case settingsManager set of
209158 Just tm -> f tm
210159 Nothing -> bracket
211− (T.initialize timeoutInSeconds)
160+ (T.initialize $ settingsTimeout set * 1000000)
212161 T.stopManager
213162 f
214163
164+onE :: Settings -> Maybe Request -> SomeException -> IO ()
165+onE set mreq e = case fromException e of
166+ Just (NotEnoughLines []) -> return ()
167+ _ -> settingsOnException set mreq e
168+
215169-- Note that there is a thorough discussion of the exception safety of the
216170-- following code at: https://github.com/yesodweb/wai/issues/146
217171--
@@ -228,20 +182,17 @@ runSettingsConnectionMakerSecure set getConnMaker app = do
228182acceptConnection :: Settings
229183 -> IO (IO (Connection, Transport), SockAddr)
230184 -> Application
185+ -> D.DateCache
186+ -> Maybe F.MutableFdCache
187+ -> T.Manager
231188 -> Counter
232− -> InternalInfo
233189 -> IO ()
234−acceptConnection set getConnMaker app counter ii = do
190+acceptConnection set getConnMaker app dc fc tm counter = do
235191 -- First mask all exceptions in acceptLoop. This is necessary to
236192 -- ensure that no async exception is throw between the call to
237193 -- acceptNewConnection and the registering of connClose.
238− --
239− -- acceptLoop can be broken by closing the listing socket.
240− 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
194+ void $ mask_ $ acceptLoop
195+ gracefulShutdown counter
245196 where
246197 acceptLoop = do
247198 -- Allow async exceptions before receiving the next connection maker.
@@ -258,21 +209,24 @@ acceptConnection set getConnMaker app counter ii = do
258209 case mx of
259210 Nothing -> return ()
260211 Just (mkConn, addr) -> do
261− fork set mkConn addr app counter ii
212+ fork set mkConn addr app dc fc tm counter
262213 acceptLoop
263214
264215 acceptNewConnection = do
265216 ex <- try getConnMaker
266217 case ex of
267218 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
219+ Left e -> do
220+ onE set Nothing $ toException e
221+ if isFullErrorType (ioeGetErrorType e) then do
222+ -- "resource exhausted (Too many open files)" may
223+ -- happen by accept(). Wait a second hoping that
224+ -- resource will be available.
225+ threadDelay 1000000
226+ acceptNewConnection
227+ else
228+ -- Assuming the listen socket is closed.
229+ return Nothing
276230
277231-- Fork a new worker thread for this connection maker, and ask for a
278232-- function to unmask (i.e., allow async exceptions to be thrown).
@@ -280,97 +234,64 @@ fork :: Settings
280234 -> IO (Connection, Transport)
281235 -> SockAddr
282236 -> Application
237+ -> D.DateCache
238+ -> Maybe F.MutableFdCache
239+ -> T.Manager
283240 -> Counter
284− -> InternalInfo
285241 -> 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
242+fork set mkConn addr app dc fc tm counter = settingsFork set $ \ unmask ->
243+ -- Run the connection maker to get a new connection, and ensure
244+ -- that the connection is closed. If the mkConn call throws an
245+ -- exception, we will leak the connection. If the mkConn call is
246+ -- vulnerable to attacks (e.g., Slowloris), we do nothing to
247+ -- protect the server. It is therefore vital that mkConn is well
248+ -- vetted.
249+ --
250+ -- We grab the connection before registering timeouts since the
251+ -- timeouts will be useless during connection creation, due to the
252+ -- fact that async exceptions are still masked.
253+ bracket mkConn closeConn $ \(conn0, transport) ->
303254
304255 -- We need to register a timeout handler for this thread, and
305256 -- 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
257+ bracket (T.registerKillThread tm) T.cancel $ \th ->
258+
259+ let ii = InternalInfo th fc dc
260+ conn = setSendFile conn0 fc
261+ -- We now have fully registered a connection close handler
262+ -- in the case of all exceptions, so it is safe to one
263+ -- again allow async exceptions.
264+ in unmask .
265+ -- Call the user-supplied on exception code if any
266+ -- exceptions are thrown.
267+ handle (onE set Nothing) .
268+
269+ -- Call the user-supplied code for connection open and close events
270+ bracket (onOpen addr) (onClose addr) $ \goingon ->
271+
272+ -- Actually serve this connection.
273+ -- bracket with closeConn above ensures the connection is closed.
274+ when goingon $ serveConnection conn ii addr transport set app
275+ where
276+ closeConn (conn, _transport) = connClose conn
320277
321278 onOpen adr = increase counter >> settingsOnOpen set adr
322279 onClose adr _ = decrease counter >> settingsOnClose set adr
323280
324281serveConnection :: Connection
325282 -> InternalInfo
326− -> T.Handle
327283 -> SockAddr
328284 -> Transport
329285 -> Settings
330286 -> Application
331287 -> IO ()
332−serveConnection conn ii th origAddr transport settings app = do
333− -- fixme: Upgrading to HTTP/2 should be supported.
334− (h2,bs) <- if isHTTP2 transport then
335− return (True, "")
336− else do
337− bs0 <- connRecv conn
338− if S.length bs0 >= 4 && "PRI " `S.isPrefixOf` bs0 then
339− return (True, bs0)
340− else
341− return (False, bs0)
288+serveConnection conn ii origAddr transport settings app = do
342289 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
354− -- fixme: origAddr
355− checkTLS
356− setConnHTTP2 conn True
357− http2 conn transport ii origAddr settings recvN sendBS app
358− else do
359− src <- mkSource (wrappedRecv conn th istatus (settingsSlowlorisSize settings))
360− writeIORef istatus True
361− leftoverSource src bs
362− 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
290+ src <- mkSource (connSource conn th istatus)
291+ addr <- getProxyProtocolAddr src
292+ http1 addr istatus src `E.catch` \e -> do
293+ sendErrorResponse addr istatus e
294+ throwIO (e :: SomeException)
374295
375296 where
376297 getProxyProtocolAddr src =
@@ -413,40 +334,32 @@ serveConnection conn ii th origAddr transport settings app = do
413334
414335 decodeAscii = map (chr . fromEnum) . S.unpack
415336
416− shouldSendErrorResponse se
417− | Just ConnectionClosedByPeer <- fromException se = False
418− | otherwise = True
337+ th = threadHandle ii
419338
420− sendErrorResponse req istatus e = do
339+ sendErrorResponse addr istatus e = do
421340 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
341+ when status $ void $
342+ sendResponse
343+ (settingsServerName settings)
344+ conn ii (dummyreq addr) defaultIndexRequestHeader (return S.empty) (errorResponse e)
426345
427346 dummyreq addr = defaultRequest { remoteHost = addr }
428347
429348 errorResponse e = settingsOnExceptionResponse settings e
430349
431− http1 firstRequest addr istatus src = do
432− (req, mremainingRef, idxhdr, nextBodyFlush) <- recvRequest firstRequest settings conn ii th addr src transport
433− keepAlive <- processRequest istatus src req mremainingRef idxhdr nextBodyFlush
350+ http1 addr istatus src = do
351+ (req', mremainingRef, idxhdr) <- recvRequest settings conn ii addr src
352+ let req = req' { isSecure = isTransportSecure transport }
353+ keepAlive <- processRequest istatus src req mremainingRef idxhdr
434354 `E.catch` \e -> do
435− settingsOnException settings (Just req) e
436− -- Don't throw the error again to prevent calling settingsOnException twice.
355+ -- Call the user-supplied exception handlers, passing the request.
356+ sendErrorResponse addr istatus e
357+ onE settings (Just req) e
358+ -- Don't throw the error again to prevent calling onE twice.
437359 return False
360+ when keepAlive $ http1 addr istatus src
438361
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
448−
449− processRequest istatus src req mremainingRef idxhdr nextBodyFlush = do
362+ processRequest istatus src req mremainingRef idxhdr = do
450363 -- Let the application run for as long as it wants
451364 T.pause th
452365
@@ -454,50 +367,44 @@ serveConnection conn ii th origAddr transport settings app = do
454367 -- creating the request, we need to make sure that we don't get
455368 -- an async exception before calling the ResponseSource.
456369 keepAliveRef <- newIORef $ error "keepAliveRef not filled"
457− r <- E.try $ app req $ \res -> do
370+ _ <- app req $ \res -> do
458371 T.resume th
459372 -- FIXME consider forcing evaluation of the res here to
460373 -- send more meaningful error messages to the user.
461374 -- However, it may affect performance.
462375 writeIORef istatus False
463− keepAlive <- sendResponse settings conn ii th req idxhdr (readSource src) res
376+ keepAlive <- sendResponse
377+ (settingsServerName settings)
378+ conn ii req idxhdr (readSource src) res
464379 writeIORef keepAliveRef keepAlive
465380 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−
475381 keepAlive <- readIORef keepAliveRef
476382
477383 -- We just send a Response and it takes a time to
478384 -- 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
481− -- thread hoping that the next Request will arrive
385+ -- it is likely to fail and the IO manager works.
386+ -- It is very costy. So, we yield to another Haskell
387+ -- thread hoping that the next Request will arraive
482388 -- when this Haskell thread will be re-scheduled.
483389 -- This improves performance at least when
484390 -- the number of cores is small.
485391 Conc.yield
486392
487− if keepAlive
488− then
393+ if not keepAlive then
394+ return False
395+ else do
489396 -- If there is an unknown or large amount of data to still be read
490397 -- from the request body, simple drop this connection instead of
491398 -- reading it all in to satisfy a keep-alive request.
492399 case settingsMaximumBodyFlush settings of
493400 Nothing -> do
494− flushEntireBody nextBodyFlush
401+ flushEntireBody (requestBody req)
495402 T.resume th
496403 return True
497404 Just maxToRead -> do
498405 let tryKeepAlive = do
499406 -- flush the rest of the request body
500− isComplete <- flushBody nextBodyFlush maxToRead
407+ isComplete <- flushBody (requestBody req) maxToRead
501408 if isComplete then do
502409 T.resume th
503410 return True
@@ -511,21 +418,6 @@ serveConnection conn ii th origAddr transport settings app = do
511418 else
512419 return False
513420 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
529421
530422flushEntireBody :: IO ByteString -> IO ()
531423flushEntireBody src =
@@ -550,50 +442,26 @@ flushBody src =
550442 | toRead' >= 0 -> loop toRead'
551443 | otherwise -> return False
552444
553−wrappedRecv :: Connection -> T.Handle -> IORef Bool -> Int -> IO ByteString
554−wrappedRecv Connection { connRecv = recv } th istatus slowlorisSize = do
445+connSource :: Connection -> T.Handle -> IORef Bool -> IO ByteString
446+connSource Connection { connRecv = recv } th istatus = do
555447 bs <- recv
556448 unless (S.null bs) $ do
557449 writeIORef istatus True
558− when (S.length bs >= slowlorisSize) $ T.tickle th
559− return bs
560−
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
450+ when (S.length bs >= 2048) $ T.tickle th
572451 return bs
573452
574−-- | Set flag FileCloseOnExec flag on a socket (on Unix)
575−--
576453-- Copied from: https://github.com/mzero/plush/blob/master/src/Plush/Server/Warp.hs
577−--
578−-- @since 3.2.17
579454setSocketCloseOnExec :: Socket -> IO ()
580455#if WINDOWS
581456setSocketCloseOnExec _ = return ()
582457#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
458+setSocketCloseOnExec socket =
459+ setFdOption (fromIntegral $ fdSocket socket) CloseOnExec True
590460#endif
591461
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
462+gracefulShutdown :: Counter -> IO ()
463+gracefulShutdown counter = do
464+ -- To avoid race condition, we just use threadDelay, not MVar.
465+ threadDelay 10000000
466+ noConnections <- isZero counter
467+ unless noConnections $ gracefulShutdown counter