78365c2 · typeable/wai

git.iko.soy/typeable/wai

on master help sign in

Merge fix for event source.

78365c2Kazu Yamamoto7 years ago

warp/Network/Wai/Handler/Warp/HTTP2.hs+3−3

compare with master

unifiedsplit

@@ -24,14 +24,14 @@ import Network.Wai.Handler.Warp.Types

25----------------------------------------------------------------

27−http2 :: Connection -> Transport -> InternalInfo -> SockAddr -> S.Settings -> (BufSize -> IO ByteString) -> Application -> IO ()

27+http2 :: Connection -> Transport -> InternalInfo -> SockAddr -> S.Settings -> (BufSize -> IO ByteString) -> (ByteString -> IO ()) -> Application -> IO ()

28−http2 conn transport ii addr settings readN app =

28+http2 conn transport ii addr settings readN send app =

29 H2.run conf http2server

30 where

31 conf = H2.Config {

32 confWriteBuffer = connWriteBuffer conn

33 , confBufferSize = connBufferSize conn

34− , confSendAll = connSendAll conn

34+ , confSendAll = send

35 , confReadN = readN

36 , confPositionReadMaker = pReadMaker ii

37 }

warp/Network/Wai/Handler/Warp/Run.hs+9−1

@@ -350,11 +350,19 @@ serveConnection conn ii th origAddr transport settings app = do

350 istatus <- newIORef False

351 if settingsHTTP2Enabled settings && h2 then do

352 rawRecvN <- makeReceiveN bs (connRecv conn) (connRecvBuf conn)

353+ -- This thread becomes the sender in http2 library.

354+ -- In the case of event source, one request comes and one

355+ -- worker gets busy. But it is likely that the receiver does

356+ -- not receive any data at all while the sender is sending

357+ -- output data from the worker. It's not good enough to tickle

358+ -- the time handler in the receiver only. So, we should tickle

359+ -- the time handler in both the receiver and the sender.

353 let recvN = wrappedRecvN th istatus (settingsSlowlorisSize settings) rawRecvN

360 let recvN = wrappedRecvN th istatus (settingsSlowlorisSize settings) rawRecvN

361+ sendBS x = connSendAll conn x >> T.tickle th

354 -- fixme: origAddr

362 -- fixme: origAddr

355 checkTLS

363 checkTLS

356 setConnHTTP2 conn True

364 setConnHTTP2 conn True

357− http2 conn transport ii origAddr settings recvN app

365+ http2 conn transport ii origAddr settings recvN sendBS app

358 else do

366 else do

359 src <- mkSource (wrappedRecv conn th istatus (settingsSlowlorisSize settings))

367 src <- mkSource (wrappedRecv conn th istatus (settingsSlowlorisSize settings))

360 writeIORef istatus True

368 writeIORef istatus True