@@ -1,110 +1,85 @@
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 #-}
10{-# OPTIONS_GHC -fno-warn-deprecations #-}
5{-# OPTIONS_GHC -fno-warn-deprecations #-}
12module Network.Wai.Handler.Warp.Run where
7module Network.Wai.Handler.Warp.Run where
14−import "iproute" Data.IP (toHostAddress, toHostAddress6)
15import Control.Arrow (first)
9import Control.Arrow (first)
10+import Control.Concurrent (threadDelay)
16import qualified Control.Concurrent as Conc (yield)
11import qualified Control.Concurrent as Conc (yield)
17import Control.Exception as E
12import Control.Exception as E
13+import Control.Monad (when, unless, void)
14+import Data.ByteString (ByteString)
18import qualified Data.ByteString as S
15import qualified Data.ByteString as S
19import Data.Char (chr)
16import Data.Char (chr)
17+import Data.IP (toHostAddress, toHostAddress6)
20import Data.IORef (IORef, newIORef, readIORef, writeIORef)
18import Data.IORef (IORef, newIORef, readIORef, writeIORef)
21import Data.Streaming.Network (bindPortTCP)
19import Data.Streaming.Network (bindPortTCP)
22−import Foreign.C.Error (Errno(..), eCONNABORTED)
20+import Network (sClose, Socket)
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(..))
21+import Network.Socket (accept, withSocketsDo, SockAddr(SockAddrInet, SockAddrInet6))
26−#if MIN_VERSION_network(3,1,1)
27−import Network.Socket (gracefulClose)
29import qualified Network.Socket.ByteString as Sock
22import qualified Network.Socket.ByteString as Sock
30import Network.Wai
23import 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
24import Network.Wai.Handler.Warp.Buffer
37import Network.Wai.Handler.Warp.Counter
25import Network.Wai.Handler.Warp.Counter
38import qualified Network.Wai.Handler.Warp.Date as D
26import qualified Network.Wai.Handler.Warp.Date as D
39import qualified Network.Wai.Handler.Warp.FdCache as F
27import 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)
43import Network.Wai.Handler.Warp.Header
28import Network.Wai.Handler.Warp.Header
44−import Network.Wai.Handler.Warp.Imports hiding (readInt)
45import Network.Wai.Handler.Warp.ReadInt
29import Network.Wai.Handler.Warp.ReadInt
46import Network.Wai.Handler.Warp.Recv
30import Network.Wai.Handler.Warp.Recv
47import Network.Wai.Handler.Warp.Request
31import Network.Wai.Handler.Warp.Request
48import Network.Wai.Handler.Warp.Response
32import Network.Wai.Handler.Warp.Response
49import Network.Wai.Handler.Warp.SendFile
33import Network.Wai.Handler.Warp.SendFile
50import Network.Wai.Handler.Warp.Settings
34import Network.Wai.Handler.Warp.Settings
35+import qualified Network.Wai.Handler.Warp.Timeout as T
51import Network.Wai.Handler.Warp.Types
36import 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)
54#if WINDOWS
41#if WINDOWS
55import Network.Wai.Handler.Warp.Windows
42import Network.Wai.Handler.Warp.Windows
44+import System.Posix.IO (FdOption(CloseOnExec), setFdOption)
57import Network.Socket (fdSocket)
45import Network.Socket (fdSocket)
60−-- | Creating 'Connection' for plain HTTP based on a given socket.
48+-- | Default action value for 'Connection'.
61−socketConnection :: Settings -> Socket -> IO Connection
49+socketConnection :: Socket -> IO Connection
62−#if MIN_VERSION_network(3,1,1)
63−socketConnection set s = do
65−socketConnection _ s = do
50+socketConnection s = do
66−#endif
51+ readBuf <- allocateBuffer bufferSize
67− bufferPool <- newBufferPool
68 writeBuf <- allocateBuffer bufferSize
52 writeBuf <- allocateBuffer bufferSize
69− let sendall = Sock.sendAll s
70− isH2 <- newIORef False -- HTTP/1.x
71 return Connection {
53 return Connection {
72 connSendMany = Sock.sendMany s
54 connSendMany = Sock.sendMany s
73− , connSendAll = sendall
55+ , connSendAll = Sock.sendAll s
74− , connSendFile = sendFile s writeBuf bufferSize sendall
56+ , connSendFile = defaultSendFile s
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
57+ , connClose = sClose s >> freeBuffer readBuf >> freeBuffer writeBuf
88− , connRecv = receive s bufferPool
58+ , connRecv = receive s readBuf bufferSize
89− , connRecvBuf = receiveBuf s
59+ , connReadBuffer = readBuf
90 , connWriteBuffer = writeBuf
60 , connWriteBuffer = writeBuf
91 , connBufferSize = bufferSize
61 , connBufferSize = bufferSize
92− , connHTTP2 = isH2
62+ , connSendFileOverride = Override s
65+#if __GLASGOW_HASKELL__ < 702
66+allowInterrupt :: IO ()
67+allowInterrupt = unblock $ return ()
95−-- | Run an 'Application' on the given port.
70+-- | Run an 'Application' on the given port. This calls 'runSettings' with
96−-- This calls 'runSettings' with 'defaultSettings'.
71+-- 'defaultSettings'.
97run :: Port -> Application -> IO ()
72run :: Port -> Application -> IO ()
98run p = runSettings defaultSettings { settingsPort = p }
73run p = runSettings defaultSettings { settingsPort = p }
100−-- | Run an 'Application' on the port present in the @PORT@
75+-- | Run an 'Application' on the port present in the @PORT@ environment variable
101−-- environment variable. Uses the 'Port' given when the variable is unset.
77+-- Uses the 'Port' given when the variable is unset.
102−-- This calls 'runSettings' with 'defaultSettings'.
104-- Since 3.0.9
79-- Since 3.0.9
105runEnv :: Port -> Application -> IO ()
80runEnv :: Port -> Application -> IO ()
106runEnv p app = do
81runEnv p app = do
107− mp <- lookupEnv "PORT"
82+ mp <- fmap (lookup "PORT") getEnvironment
109 maybe (run p app) runReadPort mp
84 maybe (run p app) runReadPort mp
@@ -115,28 +90,24 @@ runEnv p app = do
115 _ -> fail $ "Invalid value in $PORT: " ++ sp
90 _ -> fail $ "Invalid value in $PORT: " ++ sp
117-- | Run an 'Application' with the given 'Settings'.
92-- | Run an 'Application' with the given 'Settings'.
118−-- This opens a listen socket on the port defined in 'Settings' and
119−-- calls 'runSettingsSocket'.
120runSettings :: Settings -> Application -> IO ()
93runSettings :: Settings -> Application -> IO ()
121runSettings set app = withSocketsDo $
94runSettings set app = withSocketsDo $
123 (bindPortTCP (settingsPort set) (settingsHost set))
96 (bindPortTCP (settingsPort set) (settingsHost set))
125 (\socket -> do
98 (\socket -> do
126 setSocketCloseOnExec socket
99 setSocketCloseOnExec socket
127 runSettingsSocket set socket app)
100 runSettingsSocket set socket app)
129−-- | This installs a shutdown handler for the given socket and
102+-- | Same as 'runSettings', but uses a user-supplied socket instead of opening
130−-- calls 'runSettingsConnection' with the default connection setup action
103+-- one. This allows the user to provide, for example, Unix named socket, which
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.
135−-- The supplied socket can be a Unix named socket, which
136-- can be used when reverse HTTP proxying into your application.
104-- can be used when reverse HTTP proxying into your application.
138-- Note that the 'settingsPort' will still be passed to 'Application's via the
106-- Note that the 'settingsPort' will still be passed to 'Application's via the
139-- 'serverPort' record.
107-- 'serverPort' record.
109+-- When the listen socket in the second argument is closed, all live
110+-- connections are gracefully shut down.
140runSettingsSocket :: Settings -> Socket -> Application -> IO ()
111runSettingsSocket :: Settings -> Socket -> Application -> IO ()
141runSettingsSocket set socket app = do
112runSettingsSocket set socket app = do
142 settingsInstallShutdownHandler set closeListenSocket
113 settingsInstallShutdownHandler set closeListenSocket
@@ -149,20 +120,15 @@ runSettingsSocket set socket app = do
149 (s, sa) <- accept socket
120 (s, sa) <- accept socket
151 setSocketCloseOnExec s
122 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
123+ conn <- socketConnection s
155 return (conn, sa)
124 return (conn, sa)
157− closeListenSocket = close socket
126+ closeListenSocket = sClose socket
159−-- | The connection setup action would be expensive. A good example
128+-- | Allows you to provide a function which will return a 'Connection'. In
160−-- is initialization of TLS.
129+-- cases where creating the @Connection@ can be expensive, this allows the
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
130+-- expensive computations to be performed in a separate thread instead of the
165−-- in a separate worker thread instead of the main server loop.
131+-- main server loop.
167-- Since 1.3.5
133-- Since 1.3.5
168runSettingsConnection :: Settings -> IO (Connection, SockAddr) -> Application -> IO ()
134runSettingsConnection :: Settings -> IO (Connection, SockAddr) -> Application -> IO ()
@@ -172,46 +138,41 @@ runSettingsConnection set getConn app = runSettingsConnectionMaker set getConnMa
172 (conn, sa) <- getConn
138 (conn, sa) <- getConn
173 return (return conn, sa)
139 return (return conn, sa)
175−-- | This modifies the connection maker so that it returns 'TCP' for 'Transport'
176−-- (i.e. plain HTTP) then calls 'runSettingsConnectionMakerSecure'.
177runSettingsConnectionMaker :: Settings -> IO (IO Connection, SockAddr) -> Application -> IO ()
141runSettingsConnectionMaker :: Settings -> IO (IO Connection, SockAddr) -> Application -> IO ()
178runSettingsConnectionMaker x y =
142runSettingsConnectionMaker x y =
179− runSettingsConnectionMakerSecure x (toTCP <$> y)
143+ runSettingsConnectionMakerSecure x (go y)
181− toTCP = first ((, TCP) <$>)
145+ go = fmap (first (fmap (, TCP)))
183----------------------------------------------------------------
147----------------------------------------------------------------
185−-- | The core run function which takes 'Settings',
149+-- | Allows you to provide a function which will return a function
186−-- a connection maker and 'Application'.
150+-- which will return 'Connection'.
187−-- The connection maker can return a connection of either plain HTTP
190-- Since 2.1.4
152-- Since 2.1.4
191runSettingsConnectionMakerSecure :: Settings -> IO (IO (Connection, Transport), SockAddr) -> Application -> IO ()
153runSettingsConnectionMakerSecure :: Settings -> IO (IO (Connection, Transport), SockAddr) -> Application -> IO ()
192runSettingsConnectionMakerSecure set getConnMaker app = do
154runSettingsConnectionMakerSecure set getConnMaker app = do
193 settingsBeforeMainLoop set
155 settingsBeforeMainLoop set
194 counter <- newCounter
156 counter <- newCounter
158+ D.withDateCache $ \dc ->
159+ F.withFdCache fdCacheDurationInSeconds $ \fc ->
160+ withTimeoutManager $ \tm ->
195− withII $ acceptConnection set getConnMaker app counter
161+ acceptConnection set getConnMaker app dc fc tm counter
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
205− !fdCacheDurationInSeconds = settingsFdCacheDuration set * 1000000
163+ fdCacheDurationInSeconds = settingsFdCacheDuration set * 1000000
206− !fdFileInfoDurationInSeconds = settingsFileInfoCacheDuration set * 1000000
207− !timeoutInSeconds = settingsTimeout set * 1000000
208 withTimeoutManager f = case settingsManager set of
164 withTimeoutManager f = case settingsManager set of
209 Just tm -> f tm
165 Just tm -> f tm
210 Nothing -> bracket
166 Nothing -> bracket
211− (T.initialize timeoutInSeconds)
167+ (T.initialize $ settingsTimeout set * 1000000)
212 T.stopManager
168 T.stopManager
171+onE :: Settings -> Maybe Request -> SomeException -> IO ()
172+onE set mreq e = case fromException e of
173+ Just (NotEnoughLines []) -> return ()
174+ _ -> settingsOnException set mreq e
215-- Note that there is a thorough discussion of the exception safety of the
176-- Note that there is a thorough discussion of the exception safety of the
216-- following code at: https://github.com/yesodweb/wai/issues/146
177-- following code at: https://github.com/yesodweb/wai/issues/146
@@ -228,20 +189,17 @@ runSettingsConnectionMakerSecure set getConnMaker app = do
228acceptConnection :: Settings
189acceptConnection :: Settings
229 -> IO (IO (Connection, Transport), SockAddr)
190 -> IO (IO (Connection, Transport), SockAddr)
230 -> Application
191 -> Application
193+ -> Maybe F.MutableFdCache
231 -> Counter
195 -> Counter
234−acceptConnection set getConnMaker app counter ii = do
197+acceptConnection set getConnMaker app dc fc tm counter = do
235 -- First mask all exceptions in acceptLoop. This is necessary to
198 -- First mask all exceptions in acceptLoop. This is necessary to
236 -- ensure that no async exception is throw between the call to
199 -- ensure that no async exception is throw between the call to
237 -- acceptNewConnection and the registering of connClose.
200 -- acceptNewConnection and the registering of connClose.
239− -- acceptLoop can be broken by closing the listing socket.
240− void $ mask_ acceptLoop
201+ 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
202+ gracefulShutdown counter
246 acceptLoop = do
204 acceptLoop = do
247 -- Allow async exceptions before receiving the next connection maker.
205 -- Allow async exceptions before receiving the next connection maker.
@@ -258,21 +216,24 @@ acceptConnection set getConnMaker app counter ii = do
258 case mx of
216 case mx of
259 Nothing -> return ()
217 Nothing -> return ()
260 Just (mkConn, addr) -> do
218 Just (mkConn, addr) -> do
261− fork set mkConn addr app counter ii
219+ fork set mkConn addr app dc fc tm counter
262 acceptLoop
220 acceptLoop
264 acceptNewConnection = do
222 acceptNewConnection = do
265 ex <- try getConnMaker
223 ex <- try getConnMaker
266 case ex of
224 case ex of
267 Right x -> return $ Just x
225 Right x -> return $ Just x
268− Left e -> do
226+ Left e -> do
269− let eConnAborted = getErrno eCONNABORTED
227+ onE set Nothing $ toException e
270− getErrno (Errno cInt) = cInt
228+ if isFullErrorType (ioeGetErrorType e) then do
271− if ioe_errno e == Just eConnAborted
229+ -- "resource exhausted (Too many open files)" may
230+ -- happen by accept(). Wait a second hoping that
231+ -- resource will be available.
272− then acceptNewConnection
233+ acceptNewConnection
274− settingsOnException set Nothing $ toException e
235+ -- Assuming the listen socket is closed.
275− return Nothing
236+ return Nothing
277-- Fork a new worker thread for this connection maker, and ask for a
238-- 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).
239-- function to unmask (i.e., allow async exceptions to be thrown).
@@ -280,97 +241,64 @@ fork :: Settings
280 -> IO (Connection, Transport)
241 -> IO (Connection, Transport)
281 -> SockAddr
242 -> SockAddr
282 -> Application
243 -> Application
245+ -> Maybe F.MutableFdCache
283 -> Counter
247 -> Counter
286−fork set mkConn addr app counter ii = settingsFork set $ \unmask ->
249+fork set mkConn addr app dc fc tm counter = 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
250+ -- Run the connection maker to get a new connection, and ensure
291− -- that the connection is closed. If the mkConn call throws an
251+ -- that the connection is closed. If the mkConn call throws an
292− -- exception, we will leak the connection. If the mkConn call is
252+ -- exception, we will leak the connection. If the mkConn call is
293− -- vulnerable to attacks (e.g., Slowloris), we do nothing to
253+ -- vulnerable to attacks (e.g., Slowloris), we do nothing to
294− -- protect the server. It is therefore vital that mkConn is well
254+ -- protect the server. It is therefore vital that mkConn is well
295− -- vetted.
255+ -- vetted.
297− -- We grab the connection before registering timeouts since the
257+ -- We grab the connection before registering timeouts since the
298− -- timeouts will be useless during connection creation, due to the
258+ -- timeouts will be useless during connection creation, due to the
299− -- fact that async exceptions are still masked.
259+ -- fact that async exceptions are still masked.
300− bracket mkConn cleanUp (serve unmask)
260+ bracket mkConn closeConn $ \(conn0, transport) ->
302− cleanUp (conn, _) = connClose conn `finally` connFree conn
304 -- We need to register a timeout handler for this thread, and
262 -- We need to register a timeout handler for this thread, and
305 -- cancel that handler as soon as we exit.
263 -- cancel that handler as soon as we exit.
306− serve unmask (conn, transport) = bracket register cancel $ \th -> do
264+ bracket (T.registerKillThread tm) T.cancel $ \th ->
266+ let ii = InternalInfo th fc dc
267+ conn = setSendFile conn0 fc
307− -- We now have fully registered a connection close handler in
268+ -- We now have fully registered a connection close handler
308− -- the case of all exceptions, so it is safe to once again
269+ -- in the case of all exceptions, so it is safe to one
309− -- allow async exceptions.
270+ -- again allow async exceptions.
310− unmask .
271+ in unmask .
272+ -- Call the user-supplied on exception code if any
273+ -- exceptions are thrown.
274+ handle (onE set Nothing) .
311− -- Call the user-supplied code for connection open and
276+ -- Call the user-supplied code for connection open and close events
313− bracket (onOpen addr) (onClose addr) $ \goingon ->
277+ bracket (onOpen addr) (onClose addr) $ \goingon ->
314− -- Actually serve this connection. bracket with closeConn
279+ -- Actually serve this connection.
315− -- above ensures the connection is closed.
280+ -- bracket with closeConn above ensures the connection is closed.
316− when goingon $ serveConnection conn ii th addr transport set app
281+ when goingon $ serveConnection conn ii addr transport set app
318− register = T.registerKillThread (timeoutManager ii) (connClose conn)
283+ closeConn (conn, _transport) = connClose conn
321 onOpen adr = increase counter >> settingsOnOpen set adr
285 onOpen adr = increase counter >> settingsOnOpen set adr
322 onClose adr _ = decrease counter >> settingsOnClose set adr
286 onClose adr _ = decrease counter >> settingsOnClose set adr
324serveConnection :: Connection
288serveConnection :: Connection
325 -> InternalInfo
289 -> InternalInfo
327 -> SockAddr
290 -> SockAddr
328 -> Transport
291 -> Transport
329 -> Settings
292 -> Settings
330 -> Application
293 -> Application
332−serveConnection conn ii th origAddr transport settings app = do
295+serveConnection conn ii origAddr transport settings app = do
333− -- fixme: Upgrading to HTTP/2 should be supported.
334− (h2,bs) <- if isHTTP2 transport then
337− bs0 <- connRecv conn
338− if S.length bs0 >= 4 && "PRI " `S.isPrefixOf` bs0 then
342 istatus <- newIORef False
296 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
356− setConnHTTP2 conn True
357− http2 conn transport ii origAddr settings recvN sendBS app
359− src <- mkSource (wrappedRecv conn th istatus (settingsSlowlorisSize settings))
297+ src <- mkSource (connSource conn th istatus)
360− writeIORef istatus True
361− leftoverSource src bs
362− addr <- getProxyProtocolAddr src
298+ addr <- getProxyProtocolAddr src
363− http1 True addr istatus src `E.catch` \e ->
299+ http1 addr istatus src `E.catch` \e -> do
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
300+ sendErrorResponse addr istatus e
373− throwIO e
301+ throwIO (e :: SomeException)
376 getProxyProtocolAddr src =
304 getProxyProtocolAddr src =
@@ -413,40 +341,32 @@ serveConnection conn ii th origAddr transport settings app = do
414 decodeAscii = map (chr . fromEnum) . S.unpack
342 decodeAscii = map (chr . fromEnum) . S.unpack
416− shouldSendErrorResponse se
344+ th = threadHandle ii
417− | Just ConnectionClosedByPeer <- fromException se = False
420− sendErrorResponse req istatus e = do
346+ sendErrorResponse addr istatus e = do
421 status <- readIORef istatus
347 status <- readIORef istatus
422− if shouldSendErrorResponse e && status
348+ when status $ void $
423− then do
349+ sendResponse
350+ (settingsServerName settings)
424− sendResponse settings conn ii th req defaultIndexRequestHeader (return S.empty) (errorResponse e)
351+ conn ii (dummyreq addr) defaultIndexRequestHeader (return S.empty) (errorResponse e)
427 dummyreq addr = defaultRequest { remoteHost = addr }
353 dummyreq addr = defaultRequest { remoteHost = addr }
429 errorResponse e = settingsOnExceptionResponse settings e
355 errorResponse e = settingsOnExceptionResponse settings e
431− http1 firstRequest addr istatus src = do
357+ http1 addr istatus src = do
432− (req, mremainingRef, idxhdr, nextBodyFlush) <- recvRequest firstRequest settings conn ii th addr src transport
358+ (req', mremainingRef, idxhdr) <- recvRequest settings conn ii addr src
359+ let req = req' { isSecure = isTransportSecure transport }
433− keepAlive <- processRequest istatus src req mremainingRef idxhdr nextBodyFlush
360+ keepAlive <- processRequest istatus src req mremainingRef idxhdr
434 `E.catch` \e -> do
361 `E.catch` \e -> do
362+ -- Call the user-supplied exception handlers, passing the request.
363+ sendErrorResponse addr istatus e
435− settingsOnException settings (Just req) e
364+ onE settings (Just req) e
436− -- Don't throw the error again to prevent calling settingsOnException twice.
365+ -- Don't throw the error again to prevent calling onE twice.
437 return False
366 return False
367+ when keepAlive $ http1 addr istatus src
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
369+ processRequest istatus src req mremainingRef idxhdr = do
450 -- Let the application run for as long as it wants
370 -- Let the application run for as long as it wants
451 T.pause th
371 T.pause th
@@ -454,50 +374,44 @@ serveConnection conn ii th origAddr transport settings app = do
454 -- creating the request, we need to make sure that we don't get
374 -- creating the request, we need to make sure that we don't get
455 -- an async exception before calling the ResponseSource.
375 -- an async exception before calling the ResponseSource.
456 keepAliveRef <- newIORef $ error "keepAliveRef not filled"
376 keepAliveRef <- newIORef $ error "keepAliveRef not filled"
457− r <- E.try $ app req $ \res -> do
377+ _ <- app req $ \res -> do
458 T.resume th
378 T.resume th
459 -- FIXME consider forcing evaluation of the res here to
379 -- FIXME consider forcing evaluation of the res here to
460 -- send more meaningful error messages to the user.
380 -- send more meaningful error messages to the user.
461 -- However, it may affect performance.
381 -- However, it may affect performance.
462 writeIORef istatus False
382 writeIORef istatus False
383+ keepAlive <- sendResponse
384+ (settingsServerName settings)
463− keepAlive <- sendResponse settings conn ii th req idxhdr (readSource src) res
385+ conn ii req idxhdr (readSource src) res
464 writeIORef keepAliveRef keepAlive
386 writeIORef keepAliveRef keepAlive
465 return ResponseReceived
387 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
388 keepAlive <- readIORef keepAliveRef
477 -- We just send a Response and it takes a time to
390 -- We just send a Response and it takes a time to
478 -- receive a Request again. If we immediately call recv,
391 -- receive a Request again. If we immediately call recv,
479− -- it is likely to fail and cause the IO manager to do some work.
392+ -- it is likely to fail and the IO manager works.
480− -- It is very costly, so we yield to another Haskell
393+ -- It is very costy. So, we yield to another Haskell
481− -- thread hoping that the next Request will arrive
394+ -- thread hoping that the next Request will arraive
482 -- when this Haskell thread will be re-scheduled.
395 -- when this Haskell thread will be re-scheduled.
483 -- This improves performance at least when
396 -- This improves performance at least when
484 -- the number of cores is small.
397 -- the number of cores is small.
485 Conc.yield
398 Conc.yield
487− if keepAlive
400+ if not keepAlive then
488− then
401+ return False
489 -- If there is an unknown or large amount of data to still be read
403 -- 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
404 -- from the request body, simple drop this connection instead of
491 -- reading it all in to satisfy a keep-alive request.
405 -- reading it all in to satisfy a keep-alive request.
492 case settingsMaximumBodyFlush settings of
406 case settingsMaximumBodyFlush settings of
493 Nothing -> do
407 Nothing -> do
494− flushEntireBody nextBodyFlush
408+ flushEntireBody (requestBody req)
495 T.resume th
409 T.resume th
496 return True
410 return True
497 Just maxToRead -> do
411 Just maxToRead -> do
498 let tryKeepAlive = do
412 let tryKeepAlive = do
499 -- flush the rest of the request body
413 -- flush the rest of the request body
500− isComplete <- flushBody nextBodyFlush maxToRead
414+ isComplete <- flushBody (requestBody req) maxToRead
501 if isComplete then do
415 if isComplete then do
502 T.resume th
416 T.resume th
503 return True
417 return True
@@ -511,21 +425,6 @@ serveConnection conn ii th origAddr transport settings app = do
512 return False
426 return False
513 Nothing -> tryKeepAlive
427 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 ()
429flushEntireBody :: IO ByteString -> IO ()
531flushEntireBody src =
430flushEntireBody src =
@@ -550,50 +449,26 @@ flushBody src =
550 | toRead' >= 0 -> loop toRead'
449 | toRead' >= 0 -> loop toRead'
551 | otherwise -> return False
450 | otherwise -> return False
553−wrappedRecv :: Connection -> T.Handle -> IORef Bool -> Int -> IO ByteString
452+connSource :: Connection -> T.Handle -> IORef Bool -> IO ByteString
554−wrappedRecv Connection { connRecv = recv } th istatus slowlorisSize = do
453+connSource Connection { connRecv = recv } th istatus = do
555 bs <- recv
454 bs <- recv
556 unless (S.null bs) $ do
455 unless (S.null bs) $ do
557 writeIORef istatus True
456 writeIORef istatus True
558− when (S.length bs >= slowlorisSize) $ T.tickle th
457+ when (S.length bs >= 2048) $ T.tickle th
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
572 return bs
458 return bs
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
460-- Copied from: https://github.com/mzero/plush/blob/master/src/Plush/Server/Warp.hs
579setSocketCloseOnExec :: Socket -> IO ()
461setSocketCloseOnExec :: Socket -> IO ()
580#if WINDOWS
462#if WINDOWS
581setSocketCloseOnExec _ = return ()
463setSocketCloseOnExec _ = return ()
583−setSocketCloseOnExec socket = do
465+setSocketCloseOnExec socket =
584−#if MIN_VERSION_network(3,0,0)
466+ setFdOption (fromIntegral $ fdSocket socket) CloseOnExec True
585− fd <- fdSocket socket
587− let fd = fdSocket socket
589− F.setFileCloseOnExec $ fromIntegral fd
592−gracefulShutdown :: Settings -> Counter -> IO ()
469+gracefulShutdown :: Counter -> IO ()
593−gracefulShutdown set counter =
470+gracefulShutdown counter = do
594− case settingsGracefulShutdownTimeout set of
471+ -- To avoid race condition, we just use threadDelay, not MVar.
595− Nothing ->
472+ threadDelay 10000000
596− waitForZero counter
473+ noConnections <- isZero counter
597− (Just seconds) ->
474+ unless noConnections $ gracefulShutdown counter
598− void (timeout (seconds * microsPerSecond) (waitForZero counter))
599− where microsPerSecond = 1000000