098b503 · servant · git.iko.soy

git.iko.soy/servant

Don't send an Accept header if the list of accepted types is empty

commit098b5036251408e571b843e4264edfdb7f91bab2 authorTimo von Holtz <tvh@anchor.com.au> dateTue 17 Feb 2015, 11:56 (12 years ago) parentc444ec8

1 file changed+3−2

unifiedsplit

src/Servant/Common/Req.hs+3−2

@@ -13,7 +13,7 @@ import Data.Aeson

1313import Data.Aeson.Parser

1414import Data.Aeson.Types

1515import Data.Attoparsec.ByteString

16−import Data.ByteString.Lazy hiding (pack, filter, map)

16+import Data.ByteString.Lazy hiding (pack, filter, map, null)

1717import qualified Data.ByteString as BS

1818import qualified Data.ByteString.Char8 as BSC

1919import Data.String

@@ -93,7 +93,8 @@ reqToRequest req (BaseUrl reqScheme reqHost reqPort) =

9393 setheaders r = r { requestHeaders = requestHeaders r

9494 ++ Prelude.map toProperHeader (headers req) }

9595 setAccept r = r { requestHeaders = filter ((/= "Accept") . fst) (requestHeaders r)

96− ++ [("Accept", BS.intercalate ", " (map renderAccept $ reqAccept req))] }

96+ ++ [("Accept", BS.intercalate ", " (map renderAccept $ reqAccept req))

97+ | not . null . reqAccept $ req] }

9798 renderAccept :: MediaType -> BS.ByteString

9899 renderAccept m = BSC.pack (show m)

99100 toProperHeader (name, val) =