git.iko.soy/typeable/wai
on master help sign in
passing transport to toRequest.
commita07c4ae5552d147c3687af5cb641a69766378c5e authorKazu Yamamoto <kazu@iij.ad.jp> dateWed 27 Nov 2019, 22:06 (7 years ago) parent54bddfd
2 files changed+6−7
compare with master
unifiedsplit
warp/Network/Wai/Handler/Warp/HTTP2.hs+1−2 warp/Network/Wai/Handler/Warp/HTTP2/Request.hs+5−5
warp/Network/Wai/Handler/Warp/HTTP2.hs+1−2
@@ -63,13 +63,12 @@ http2 conn transport ii addr settings readN app =
6363 logResponse h2rsp' req
6464 return ()
6565
66− toWAIRequest h2req aux = toRequest ii settings addr hdr bdylen bdy th secure
66+ toWAIRequest h2req aux = toRequest ii settings addr hdr bdylen bdy th transport
6767 where
6868 !hdr = H2.requestHeaders h2req
6969 !bdy = H2.getRequestBodyChunk h2req
7070 !bdylen = H2.requestBodySize h2req
7171 !th = H2.auxTimeHandle aux
72− !secure = isTransportSecure transport
7372
7473 logResponse h2rsp req = logger req st msiz
7574 where
warp/Network/Wai/Handler/Warp/HTTP2/Request.hs+5−5
@@ -26,19 +26,19 @@ import Network.Wai.Handler.Warp.Request (getFileInfoKey, pauseTimeoutKey)
2626import qualified Network.Wai.Handler.Warp.Settings as S (Settings, settingsNoParsePath)
2727import Network.Wai.Handler.Warp.Types
2828
29−type ToReq = (TokenHeaderList,ValueTable) -> Maybe Int -> IO ByteString -> T.Handle -> Bool -> IO Request
29+type ToReq = (TokenHeaderList,ValueTable) -> Maybe Int -> IO ByteString -> T.Handle -> Transport -> IO Request
3030
3131----------------------------------------------------------------
3232
3333toRequest :: InternalInfo -> S.Settings -> SockAddr -> ToReq
34−toRequest ii settings addr ht bodylen body th secure = do
34+toRequest ii settings addr ht bodylen body th transport = do
3535 ref <- newIORef Nothing
36− toRequest' ii settings addr ref ht bodylen body th secure
36+ toRequest' ii settings addr ref ht bodylen body th transport
3737
3838toRequest' :: InternalInfo -> S.Settings -> SockAddr
3939 -> IORef (Maybe HTTP2Data)
4040 -> ToReq
41−toRequest' ii settings addr ref (reqths,reqvt) bodylen body th secure = return req
41+toRequest' ii settings addr ref (reqths,reqvt) bodylen body th transport = return req
4242 where
4343 !req = Request {
4444 requestMethod = colonMethod
@@ -48,7 +48,7 @@ toRequest' ii settings addr ref (reqths,reqvt) bodylen body th secure = return r
4848 , rawQueryString = query
4949 , queryString = H.parseQuery query
5050 , requestHeaders = headers
51− , isSecure = secure
51+ , isSecure = isTransportSecure transport
5252 , remoteHost = addr
5353 , requestBody = body
5454 , vault = vaultValue