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