@@ -1,55 +1,49 @@
1−{-# LANGUAGE BangPatterns #-}
2{-# LANGUAGE CPP #-}
1{-# LANGUAGE CPP #-}
3{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE OverloadedStrings #-}
4−{-# LANGUAGE PackageImports #-}
5−{-# LANGUAGE PatternGuards #-}
6−{-# LANGUAGE RecordWildCards #-}
7{-# LANGUAGE ScopedTypeVariables #-}
3{-# LANGUAGE ScopedTypeVariables #-}
8{-# LANGUAGE TupleSections #-}
4{-# LANGUAGE TupleSections #-}
9−{-# LANGUAGE ViewPatterns #-}
5+{-# LANGUAGE PatternGuards #-}
6+{-# LANGUAGE BangPatterns #-}
10{-# OPTIONS_GHC -fno-warn-deprecations #-}
7{-# OPTIONS_GHC -fno-warn-deprecations #-}
12module Network.Wai.Handler.Warp.Run where
9module Network.Wai.Handler.Warp.Run where
14−import "iproute" Data.IP (toHostAddress, toHostAddress6)
11+#if __GLASGOW_HASKELL__ < 709
12+import Control.Applicative ((<$>))
15import Control.Arrow (first)
14import Control.Arrow (first)
15+import Control.Concurrent (threadDelay)
16import qualified Control.Concurrent as Conc (yield)
16import qualified Control.Concurrent as Conc (yield)
17import Control.Exception as E
17import Control.Exception as E
18+import Control.Monad (when, unless, void)
19+import Data.ByteString (ByteString)
18import qualified Data.ByteString as S
20import qualified Data.ByteString as S
19import Data.Char (chr)
21import Data.Char (chr)
22+import Data.IP (toHostAddress, toHostAddress6)
20import Data.IORef (IORef, newIORef, readIORef, writeIORef)
23import Data.IORef (IORef, newIORef, readIORef, writeIORef)
21import Data.Streaming.Network (bindPortTCP)
24import Data.Streaming.Network (bindPortTCP)
22−import Foreign.C.Error (Errno(..), eCONNABORTED)
25+import Network (sClose, Socket)
23−import GHC.IO.Exception (IOException(..))
26+import Network.Socket (accept, withSocketsDo, SockAddr(SockAddrInet, SockAddrInet6), setSocketOption, SocketOption(..))
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)
29import qualified Network.Socket.ByteString as Sock
27import qualified Network.Socket.ByteString as Sock
30import Network.Wai
28import 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)
36import Network.Wai.Handler.Warp.Buffer
29import Network.Wai.Handler.Warp.Buffer
37import Network.Wai.Handler.Warp.Counter
30import Network.Wai.Handler.Warp.Counter
38import qualified Network.Wai.Handler.Warp.Date as D
31import qualified Network.Wai.Handler.Warp.Date as D
39import qualified Network.Wai.Handler.Warp.FdCache as F
32import qualified Network.Wai.Handler.Warp.FdCache as F
40import qualified Network.Wai.Handler.Warp.FileInfoCache as I
33import qualified Network.Wai.Handler.Warp.FileInfoCache as I
41−import Network.Wai.Handler.Warp.HTTP2 (http2)
34+import Network.Wai.Handler.Warp.HTTP2 (http2, isHTTP2)
42−import Network.Wai.Handler.Warp.HTTP2.Types (isHTTP2)
43import Network.Wai.Handler.Warp.Header
35import Network.Wai.Handler.Warp.Header
44−import Network.Wai.Handler.Warp.Imports hiding (readInt)
45import Network.Wai.Handler.Warp.ReadInt
36import Network.Wai.Handler.Warp.ReadInt
46import Network.Wai.Handler.Warp.Recv
37import Network.Wai.Handler.Warp.Recv
47import Network.Wai.Handler.Warp.Request
38import Network.Wai.Handler.Warp.Request
48import Network.Wai.Handler.Warp.Response
39import Network.Wai.Handler.Warp.Response
49import Network.Wai.Handler.Warp.SendFile
40import Network.Wai.Handler.Warp.SendFile
50import Network.Wai.Handler.Warp.Settings
41import Network.Wai.Handler.Warp.Settings
42+import qualified Network.Wai.Handler.Warp.Timeout as T
51import Network.Wai.Handler.Warp.Types
43import 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)
54#if WINDOWS
48#if WINDOWS
55import Network.Wai.Handler.Warp.Windows
49import Network.Wai.Handler.Warp.Windows
@@ -58,40 +52,27 @@ import Network.Socket (fdSocket)
60-- | Creating 'Connection' for plain HTTP based on a given socket.
54-- | Creating 'Connection' for plain HTTP based on a given socket.
61−socketConnection :: Settings -> Socket -> IO Connection
55+socketConnection :: Socket -> IO Connection
62−#if MIN_VERSION_network(3,1,1)
56+socketConnection s = do
63−socketConnection set s = do
65−socketConnection _ s = do
67 bufferPool <- newBufferPool
57 bufferPool <- newBufferPool
68 writeBuf <- allocateBuffer bufferSize
58 writeBuf <- allocateBuffer bufferSize
69 let sendall = Sock.sendAll s
59 let sendall = Sock.sendAll s
70− isH2 <- newIORef False -- HTTP/1.x
71 return Connection {
60 return Connection {
72 connSendMany = Sock.sendMany s
61 connSendMany = Sock.sendMany s
73 , connSendAll = sendall
62 , connSendAll = sendall
74 , connSendFile = sendFile s writeBuf bufferSize sendall
63 , connSendFile = sendFile s writeBuf bufferSize sendall
75−#if MIN_VERSION_network(3,1,1)
64+ , connClose = sClose s >> freeBuffer writeBuf
78− let tm = if h2 then settingsGracefulCloseTimeout2 set
79− else settingsGracefulCloseTimeout1 set
83− gracefulClose s tm `E.catch` \(E.SomeException _) -> return ()
85− , connClose = close s
87− , connFree = freeBuffer writeBuf
88 , connRecv = receive s bufferPool
65 , connRecv = receive s bufferPool
89 , connRecvBuf = receiveBuf s
66 , connRecvBuf = receiveBuf s
90 , connWriteBuffer = writeBuf
67 , connWriteBuffer = writeBuf
91 , connBufferSize = bufferSize
68 , connBufferSize = bufferSize
71+#if __GLASGOW_HASKELL__ < 702
72+allowInterrupt :: IO ()
73+allowInterrupt = unblock $ return ()
95-- | Run an 'Application' on the given port.
76-- | Run an 'Application' on the given port.
96-- This calls 'runSettings' with 'defaultSettings'.
77-- This calls 'runSettings' with 'defaultSettings'.
97run :: Port -> Application -> IO ()
78run :: Port -> Application -> IO ()
@@ -104,7 +85,7 @@ run p = runSettings defaultSettings { settingsPort = p }
104-- Since 3.0.9
85-- Since 3.0.9
105runEnv :: Port -> Application -> IO ()
86runEnv :: Port -> Application -> IO ()
106runEnv p app = do
87runEnv p app = do
107− mp <- lookupEnv "PORT"
88+ mp <- lookup "PORT" <$> getEnvironment
109 maybe (run p app) runReadPort mp
90 maybe (run p app) runReadPort mp
@@ -121,7 +102,7 @@ runSettings :: Settings -> Application -> IO ()
121runSettings set app = withSocketsDo $
102runSettings set app = withSocketsDo $
123 (bindPortTCP (settingsPort set) (settingsHost set))
104 (bindPortTCP (settingsPort set) (settingsHost set))
125 (\socket -> do
106 (\socket -> do
126 setSocketCloseOnExec socket
107 setSocketCloseOnExec socket
127 runSettingsSocket set socket app)
108 runSettingsSocket set socket app)
@@ -151,10 +132,10 @@ runSettingsSocket set socket app = do
151 setSocketCloseOnExec s
132 setSocketCloseOnExec s
152 -- NoDelay causes an error for AF_UNIX.
133 -- NoDelay causes an error for AF_UNIX.
153 setSocketOption s NoDelay 1 `E.catch` \(E.SomeException _) -> return ()
134 setSocketOption s NoDelay 1 `E.catch` \(E.SomeException _) -> return ()
154− conn <- socketConnection set s
135+ conn <- socketConnection s
155 return (conn, sa)
136 return (conn, sa)
157− closeListenSocket = close socket
138+ closeListenSocket = sClose socket
159-- | The connection setup action would be expensive. A good example
140-- | The connection setup action would be expensive. A good example
160-- is initialization of TLS.
141-- is initialization of TLS.
@@ -192,15 +173,15 @@ runSettingsConnectionMakerSecure :: Settings -> IO (IO (Connection, Transport),
192runSettingsConnectionMakerSecure set getConnMaker app = do
173runSettingsConnectionMakerSecure set getConnMaker app = do
193 settingsBeforeMainLoop set
174 settingsBeforeMainLoop set
194 counter <- newCounter
175 counter <- newCounter
195− withII $ acceptConnection set getConnMaker app counter
176+ withII0 $ acceptConnection set getConnMaker app counter
197− withII action =
178+ withII0 action =
198 withTimeoutManager $ \tm ->
179 withTimeoutManager $ \tm ->
199 D.withDateCache $ \dc ->
180 D.withDateCache $ \dc ->
200 F.withFdCache fdCacheDurationInSeconds $ \fdc ->
181 F.withFdCache fdCacheDurationInSeconds $ \fdc ->
201 I.withFileInfoCache fdFileInfoDurationInSeconds $ \fic -> do
182 I.withFileInfoCache fdFileInfoDurationInSeconds $ \fic -> do
202− let ii = InternalInfo tm dc fdc fic
183+ let ii0 = InternalInfo0 tm dc fdc fic
203− action ii
184+ action ii0
205 !fdCacheDurationInSeconds = settingsFdCacheDuration set * 1000000
186 !fdCacheDurationInSeconds = settingsFdCacheDuration set * 1000000
206 !fdFileInfoDurationInSeconds = settingsFileInfoCacheDuration set * 1000000
187 !fdFileInfoDurationInSeconds = settingsFileInfoCacheDuration set * 1000000
@@ -229,19 +210,14 @@ acceptConnection :: Settings
229 -> IO (IO (Connection, Transport), SockAddr)
210 -> IO (IO (Connection, Transport), SockAddr)
230 -> Application
211 -> Application
231 -> Counter
212 -> Counter
232− -> InternalInfo
213+ -> InternalInfo0
234−acceptConnection set getConnMaker app counter ii = do
215+acceptConnection set getConnMaker app counter ii0 = do
235 -- First mask all exceptions in acceptLoop. This is necessary to
216 -- First mask all exceptions in acceptLoop. This is necessary to
236 -- ensure that no async exception is throw between the call to
217 -- ensure that no async exception is throw between the call to
237 -- acceptNewConnection and the registering of connClose.
218 -- acceptNewConnection and the registering of connClose.
239− -- acceptLoop can be broken by closing the listing socket.
240 void $ mask_ acceptLoop
219 void $ mask_ acceptLoop
241− -- In some cases, we want to stop Warp here without graceful shutdown.
220+ gracefulShutdown counter
242− -- So, async exceptions are allowed here.
243− -- That's why `finally` is not used.
244− gracefulShutdown set counter
246 acceptLoop = do
222 acceptLoop = do
247 -- Allow async exceptions before receiving the next connection maker.
223 -- Allow async exceptions before receiving the next connection maker.
@@ -258,21 +234,24 @@ acceptConnection set getConnMaker app counter ii = do
258 case mx of
234 case mx of
259 Nothing -> return ()
235 Nothing -> return ()
260 Just (mkConn, addr) -> do
236 Just (mkConn, addr) -> do
261− fork set mkConn addr app counter ii
237+ fork set mkConn addr app counter ii0
262 acceptLoop
238 acceptLoop
264 acceptNewConnection = do
240 acceptNewConnection = do
265 ex <- try getConnMaker
241 ex <- try getConnMaker
266 case ex of
242 case ex of
267 Right x -> return $ Just x
243 Right x -> return $ Just x
268− Left e -> do
244+ Left e -> do
269− let eConnAborted = getErrno eCONNABORTED
245+ settingsOnException set Nothing $ toException e
270− getErrno (Errno cInt) = cInt
246+ if isFullErrorType (ioeGetErrorType e) then do
271− if ioe_errno e == Just eConnAborted
247+ -- "resource exhausted (Too many open files)" may
272− then acceptNewConnection
248+ -- happen by accept(). Wait a second hoping that
273− else do
249+ -- resource will be available.
274− settingsOnException set Nothing $ toException e
250+ threadDelay 1000000
275− return Nothing
251+ acceptNewConnection
253+ -- Assuming the listen socket is closed.
277-- Fork a new worker thread for this connection maker, and ask for a
256-- Fork a new worker thread for this connection maker, and ask for a
278-- function to unmask (i.e., allow async exceptions to be thrown).
257-- function to unmask (i.e., allow async exceptions to be thrown).
@@ -281,55 +260,54 @@ fork :: Settings
281 -> SockAddr
260 -> SockAddr
282 -> Application
261 -> Application
283 -> Counter
262 -> Counter
284− -> InternalInfo
263+ -> InternalInfo0
286−fork set mkConn addr app counter ii = settingsFork set $ \unmask ->
265+fork set mkConn addr app counter ii0 = settingsFork set $ \ unmask ->
287− -- Call the user-supplied on exception code if any
266+ -- Run the connection maker to get a new connection, and ensure
288− -- exceptions are thrown.
267+ -- that the connection is closed. If the mkConn call throws an
289− handle (settingsOnException set Nothing) $
268+ -- exception, we will leak the connection. If the mkConn call is
290− -- Run the connection maker to get a new connection, and ensure
269+ -- vulnerable to attacks (e.g., Slowloris), we do nothing to
291− -- that the connection is closed. If the mkConn call throws an
270+ -- protect the server. It is therefore vital that mkConn is well
292− -- exception, we will leak the connection. If the mkConn call is
271+ -- vetted.
293− -- vulnerable to attacks (e.g., Slowloris), we do nothing to
272+ --
294− -- protect the server. It is therefore vital that mkConn is well
273+ -- We grab the connection before registering timeouts since the
295− -- vetted.
274+ -- timeouts will be useless during connection creation, due to the
296− --
275+ -- fact that async exceptions are still masked.
297− -- We grab the connection before registering timeouts since the
276+ bracket mkConn closeConn $ \(conn, transport) ->
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)
302− cleanUp (conn, _) = connClose conn `finally` connFree conn
304 -- We need to register a timeout handler for this thread, and
278 -- We need to register a timeout handler for this thread, and
305 -- cancel that handler as soon as we exit.
279 -- cancel that handler as soon as we exit.
306− serve unmask (conn, transport) = bracket register cancel $ \th -> do
280+ bracket (T.registerKillThread (timeoutManager0 ii0)) T.cancel $ \th ->
307− -- We now have fully registered a connection close handler in
281+
308− -- the case of all exceptions, so it is safe to once again
282+ let ii1 = toInternalInfo1 ii0 th
309− -- allow async exceptions.
283+ -- We now have fully registered a connection close handler
310− unmask .
284+ -- in the case of all exceptions, so it is safe to one
311− -- Call the user-supplied code for connection open and
285+ -- again allow async exceptions.
312− -- close events
286+ in unmask .
313− bracket (onOpen addr) (onClose addr) $ \goingon ->
287+ -- Call the user-supplied on exception code if any
314− -- Actually serve this connection. bracket with closeConn
288+ -- exceptions are thrown.
315− -- above ensures the connection is closed.
289+ handle (settingsOnException set Nothing) .
316− when goingon $ serveConnection conn ii th addr transport set app
290+
317− where
291+ -- Call the user-supplied code for connection open and close events
318− register = T.registerKillThread (timeoutManager ii) (connClose conn)
292+ bracket (onOpen addr) (onClose addr) $ \goingon ->
319− cancel = T.cancel
293+
294+ -- Actually serve this connection.
295+ -- bracket with closeConn above ensures the connection is closed.
296+ when goingon $ serveConnection conn ii1 addr transport set app
298+ closeConn (conn, _transport) = connClose conn
321 onOpen adr = increase counter >> settingsOnOpen set adr
300 onOpen adr = increase counter >> settingsOnOpen set adr
322 onClose adr _ = decrease counter >> settingsOnClose set adr
301 onClose adr _ = decrease counter >> settingsOnClose set adr
324serveConnection :: Connection
303serveConnection :: Connection
325− -> InternalInfo
304+ -> InternalInfo1
327 -> SockAddr
305 -> SockAddr
328 -> Transport
306 -> Transport
329 -> Settings
307 -> Settings
330 -> Application
308 -> Application
332−serveConnection conn ii th origAddr transport settings app = do
310+serveConnection conn ii1 origAddr transport settings app = do
333 -- fixme: Upgrading to HTTP/2 should be supported.
311 -- fixme: Upgrading to HTTP/2 should be supported.
334 (h2,bs) <- if isHTTP2 transport then
312 (h2,bs) <- if isHTTP2 transport then
335 return (True, "")
313 return (True, "")
@@ -339,39 +317,19 @@ serveConnection conn ii th origAddr transport settings app = do
339 return (True, bs0)
317 return (True, bs0)
341 return (False, bs0)
319 return (False, bs0)
342− istatus <- newIORef False
343 if settingsHTTP2Enabled settings && h2 then do
320 if settingsHTTP2Enabled settings && h2 then do
344− rawRecvN <- makeReceiveN bs (connRecv conn) (connRecvBuf conn)
321+ recvN <- 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
322 -- fixme: origAddr
355− checkTLS
323+ http2 conn ii1 origAddr transport settings recvN app
356− setConnHTTP2 conn True
357− http2 conn transport ii origAddr settings recvN sendBS app
325+ istatus <- newIORef False
359 src <- mkSource (wrappedRecv conn th istatus (settingsSlowlorisSize settings))
326 src <- mkSource (wrappedRecv conn th istatus (settingsSlowlorisSize settings))
360 writeIORef istatus True
327 writeIORef istatus True
361 leftoverSource src bs
328 leftoverSource src bs
362 addr <- getProxyProtocolAddr src
329 addr <- getProxyProtocolAddr src
363− http1 True addr istatus src `E.catch` \e ->
330+ http1 addr istatus src `E.catch` \e -> do
364− case () of
331+ sendErrorResponse addr istatus e
365− ()
332+ throwIO (e :: SomeException)
366− -- See comment below referencing
367− -- https://github.com/yesodweb/wai/issues/618
368− | Just NoKeepAliveRequest <- fromException e -> return ()
370− | Just (BadFirstLine _) <- fromException e -> return ()
372− _ <- sendErrorResponse (dummyreq addr) istatus e
376 getProxyProtocolAddr src =
334 getProxyProtocolAddr src =
377 case settingsProxyProtocol settings of
335 case settingsProxyProtocol settings of
@@ -413,40 +371,36 @@ serveConnection conn ii th origAddr transport settings app = do
414 decodeAscii = map (chr . fromEnum) . S.unpack
372 decodeAscii = map (chr . fromEnum) . S.unpack
374+ th = threadHandle1 ii1
416 shouldSendErrorResponse se
376 shouldSendErrorResponse se
417 | Just ConnectionClosedByPeer <- fromException se = False
377 | Just ConnectionClosedByPeer <- fromException se = False
418 | otherwise = True
378 | otherwise = True
420− sendErrorResponse req istatus e = do
380+ sendErrorResponse addr istatus e = do
421 status <- readIORef istatus
381 status <- readIORef istatus
422− if shouldSendErrorResponse e && status
382+ when (shouldSendErrorResponse e && status) $ do
423− then do
383+ let ii = toInternalInfo ii1 0 -- dummy
424− sendResponse settings conn ii th req defaultIndexRequestHeader (return S.empty) (errorResponse e)
384+ dreq = dummyreq addr
425− else return False
385+ void $ sendResponse settings conn ii dreq defaultIndexRequestHeader (return S.empty) (errorResponse e)
427 dummyreq addr = defaultRequest { remoteHost = addr }
387 dummyreq addr = defaultRequest { remoteHost = addr }
429 errorResponse e = settingsOnExceptionResponse settings e
389 errorResponse e = settingsOnExceptionResponse settings e
431− http1 firstRequest addr istatus src = do
391+ http1 addr istatus src = do
432− (req, mremainingRef, idxhdr, nextBodyFlush) <- recvRequest firstRequest settings conn ii th addr src transport
392+ (req', mremainingRef, idxhdr, nextBodyFlush, ii) <- recvRequest settings conn ii1 addr src
433− keepAlive <- processRequest istatus src req mremainingRef idxhdr nextBodyFlush
393+ let req = req' { isSecure = isTransportSecure transport }
394+ keepAlive <- processRequest istatus src req mremainingRef idxhdr nextBodyFlush ii
434 `E.catch` \e -> do
395 `E.catch` \e -> do
396+ -- Call the user-supplied exception handlers, passing the request.
397+ sendErrorResponse addr istatus e
435 settingsOnException settings (Just req) e
398 settingsOnException settings (Just req) e
436 -- Don't throw the error again to prevent calling settingsOnException twice.
399 -- Don't throw the error again to prevent calling settingsOnException twice.
437 return False
400 return False
401+ when keepAlive $ http1 addr istatus src
439− -- When doing a keep-alive connection, the other side may just
403+ processRequest istatus src req mremainingRef idxhdr nextBodyFlush ii = do
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
449− processRequest istatus src req mremainingRef idxhdr nextBodyFlush = do
450 -- Let the application run for as long as it wants
404 -- Let the application run for as long as it wants
451 T.pause th
405 T.pause th
@@ -454,38 +408,30 @@ serveConnection conn ii th origAddr transport settings app = do
454 -- creating the request, we need to make sure that we don't get
408 -- creating the request, we need to make sure that we don't get
455 -- an async exception before calling the ResponseSource.
409 -- an async exception before calling the ResponseSource.
456 keepAliveRef <- newIORef $ error "keepAliveRef not filled"
410 keepAliveRef <- newIORef $ error "keepAliveRef not filled"
457− r <- E.try $ app req $ \res -> do
411+ _ <- app req $ \res -> do
458 T.resume th
412 T.resume th
459 -- FIXME consider forcing evaluation of the res here to
413 -- FIXME consider forcing evaluation of the res here to
460 -- send more meaningful error messages to the user.
414 -- send more meaningful error messages to the user.
461 -- However, it may affect performance.
415 -- However, it may affect performance.
462 writeIORef istatus False
416 writeIORef istatus False
463− keepAlive <- sendResponse settings conn ii th req idxhdr (readSource src) res
417+ keepAlive <- sendResponse settings conn ii req idxhdr (readSource src) res
464 writeIORef keepAliveRef keepAlive
418 writeIORef keepAliveRef keepAlive
465 return ResponseReceived
419 return ResponseReceived
467− Right ResponseReceived -> return ()
468− Left e@(SomeException _)
469− | Just (ExceptionInsideResponseBody e') <- fromException e -> throwIO e'
471− keepAlive <- sendErrorResponse req istatus e
472− settingsOnException settings (Just req) e
473− writeIORef keepAliveRef keepAlive
475 keepAlive <- readIORef keepAliveRef
420 keepAlive <- readIORef keepAliveRef
477 -- We just send a Response and it takes a time to
422 -- We just send a Response and it takes a time to
478 -- receive a Request again. If we immediately call recv,
423 -- receive a Request again. If we immediately call recv,
479− -- it is likely to fail and cause the IO manager to do some work.
424+ -- it is likely to fail and the IO manager works.
480− -- It is very costly, so we yield to another Haskell
425+ -- It is very costly. So, we yield to another Haskell
481 -- thread hoping that the next Request will arrive
426 -- thread hoping that the next Request will arrive
482 -- when this Haskell thread will be re-scheduled.
427 -- when this Haskell thread will be re-scheduled.
483 -- This improves performance at least when
428 -- This improves performance at least when
484 -- the number of cores is small.
429 -- the number of cores is small.
485 Conc.yield
430 Conc.yield
487− if keepAlive
432+ if not keepAlive then
488− then
433+ return False
489 -- If there is an unknown or large amount of data to still be read
435 -- If there is an unknown or large amount of data to still be read
490 -- from the request body, simple drop this connection instead of
436 -- from the request body, simple drop this connection instead of
491 -- reading it all in to satisfy a keep-alive request.
437 -- reading it all in to satisfy a keep-alive request.
@@ -511,21 +457,6 @@ serveConnection conn ii th origAddr transport settings app = do
512 return False
458 return False
513 Nothing -> tryKeepAlive
459 Nothing -> tryKeepAlive
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
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
526− einfo = H2.encodeInfo id 0
527− frame = H2.GoAwayFrame 0 etype debugmsg
528− bytestream = H2.encodeFrame einfo frame
530flushEntireBody :: IO ByteString -> IO ()
461flushEntireBody :: IO ByteString -> IO ()
531flushEntireBody src =
462flushEntireBody src =
@@ -558,42 +489,13 @@ wrappedRecv Connection { connRecv = recv } th istatus slowlorisSize = do
558 when (S.length bs >= slowlorisSize) $ T.tickle th
489 when (S.length bs >= slowlorisSize) $ T.tickle th
559 return bs
490 return bs
561−wrappedRecvN :: T.Handle -> IORef Bool -> Int -> (BufSize -> IO ByteString) -> (BufSize -> IO ByteString)
562−wrappedRecvN th istatus slowlorisSize readN bufsize = do
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
574−-- | Set flag FileCloseOnExec flag on a socket (on Unix)
576-- Copied from: https://github.com/mzero/plush/blob/master/src/Plush/Server/Warp.hs
492-- Copied from: https://github.com/mzero/plush/blob/master/src/Plush/Server/Warp.hs
579setSocketCloseOnExec :: Socket -> IO ()
493setSocketCloseOnExec :: Socket -> IO ()
580#if WINDOWS
494#if WINDOWS
581setSocketCloseOnExec _ = return ()
495setSocketCloseOnExec _ = return ()
583−setSocketCloseOnExec socket = do
497+setSocketCloseOnExec socket = F.setFileCloseOnExec $ fromIntegral $ fdSocket socket
584−#if MIN_VERSION_network(3,0,0)
585− fd <- fdSocket socket
587− let fd = fdSocket socket
589− F.setFileCloseOnExec $ fromIntegral fd
592−gracefulShutdown :: Settings -> Counter -> IO ()
500+gracefulShutdown :: Counter -> IO ()
593−gracefulShutdown set counter =
501+gracefulShutdown counter = waitForZero counter
594− case settingsGracefulShutdownTimeout set of
598− void (timeout (seconds * microsPerSecond) (waitForZero counter))
599− where microsPerSecond = 1000000