c4eb3f9 · typeable/wai

git.iko.soy/typeable/wai

inserting concatenated cookie after pseudo headers. (#454)

commitc4eb3f94df54ca3e5a80ed8e2c5ababd1f572eec authorKazu Yamamoto <kazu@iij.ad.jp> dateMon 19 Oct 2015, 14:23 (11 years ago) parent53b8a1d

3 files changed+18−6

compare with master

unifiedsplit

warp/Network/Wai/Handler/Warp/HTTP2/HPACK.hs+9−1 warp/Network/Wai/Handler/Warp/HTTP2/Request.hs+1−5 warp/Network/Wai/Handler/Warp/HTTP2/Types.hs+8

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

@@ -64,8 +64,16 @@ hpackDecodeHeader hdrblk Context{decodeDynamicTable} = do

6464-- [("foo","bar")]

6565-- >>> concatCookie [("cookie","a=b"),("foo","bar"),("cookie","c=d"),("cookie","e=f")]

6666-- [("cookie","a=b; c=d; e=f"),("foo","bar")]

67+-- >>> concatCookie [(":pseudo","pseudo"),("cookie","a=b"),("foo","bar"),("cookie","c=d"),("cookie","e=f")]

68+-- [(":pseudo","pseudo"),("cookie","a=b; c=d; e=f"),("foo","bar")]

6769concatCookie :: HeaderList -> HeaderList

6870concatCookie hdr = case L.partition (\x -> fst x == "cookie") hdr of

6971 ([],_) -> hdr

7072 (cookies,others) -> let cookieValue = B.intercalate "; " (map snd cookies)

71− in ("cookie",cookieValue) : others

73+ in insertAfterPseudo ("cookie",cookieValue) others

74+

75+insertAfterPseudo :: Header -> HeaderList -> HeaderList

76+insertAfterPseudo x [] = [x]

77+insertAfterPseudo x yys@(y:ys)

78+ | isPseudo (fst y) = y : insertAfterPseudo x ys

79+ | otherwise = x : yys

warp/Network/Wai/Handler/Warp/HTTP2/Request.hs+1−5

@@ -22,7 +22,7 @@ import Data.Maybe (isJust)

2222#if __GLASGOW_HASKELL__ < 709

2323import Data.Monoid (mempty)

2424#endif

25−import Data.Word8 (isUpper,_colon)

25+import Data.Word8 (isUpper)

2626import Network.HPACK

2727import Network.HTTP.Types (RequestHeaders,hRange)

2828import qualified Network.HTTP.Types as H

@@ -119,10 +119,6 @@ validateHeaders hs = case pseudo hs (emptyPseudo,id) of

119119 Nothing -> normal kvs (p, b . ((mk k,v) :))

120120 Just _ -> Nothing

121121

122− isPseudo "" = False

123− isPseudo k = BS.head k == _colon

124−

125−

126122----------------------------------------------------------------

127123

128124newReadBody :: TQueue ByteString -> IO (IO ByteString)

warp/Network/Wai/Handler/Warp/HTTP2/Types.hs+8

@@ -17,6 +17,7 @@ import Data.ByteString (ByteString)

1717import qualified Data.ByteString as BS

1818import Data.IntMap.Strict (IntMap, IntMap)

1919import qualified Data.IntMap.Strict as M

20+import Data.Word8 (_colon)

2021import qualified Network.HTTP.Types as H

2122import Network.Wai (Request, FilePart)

2223import Network.Wai.HTTP2 (PushPromise, Trailers)

@@ -308,3 +309,10 @@ enqueueOrSpawnTemporaryWaiter strm outQ out = do

308309 else do

309310 pri <- readIORef $ streamPriority strm

310311 enqueue outQ out pri

312+

313+----------------------------------------------------------------

314+

315+{-# INLINE isPseudo #-}

316+isPseudo :: ByteString -> Bool

317+isPseudo "" = False

318+isPseudo k = BS.head k == _colon