eeva/servant
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Timo von Holtz 2015-02-17 11:56:15 +11:00
parent c444ec8374
commit 098b503625
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Servant/Common/Req.hs
View file

@ -13,7 +13,7 @@ import Data.Aeson
import Data.Aeson.Parser import Data.Aeson.Parser
import Data.Aeson.Types import Data.Aeson.Types
import Data.Attoparsec.ByteString import Data.Attoparsec.ByteString
import Data.ByteString.Lazy hiding (pack, filter, map) import Data.ByteString.Lazy hiding (pack, filter, map, null)
import qualified Data.ByteString as BS import qualified Data.ByteString as BS
import qualified Data.ByteString.Char8 as BSC import qualified Data.ByteString.Char8 as BSC
import Data.String import Data.String
@ -93,7 +93,8 @@ reqToRequest req (BaseUrl reqScheme reqHost reqPort) =
setheaders r = r { requestHeaders = requestHeaders r setheaders r = r { requestHeaders = requestHeaders r
++ Prelude.map toProperHeader (headers req) } ++ Prelude.map toProperHeader (headers req) }
setAccept r = r { requestHeaders = filter ((/= "Accept") . fst) (requestHeaders r) setAccept r = r { requestHeaders = filter ((/= "Accept") . fst) (requestHeaders r)
++ [("Accept", BS.intercalate ", " (map renderAccept $ reqAccept req))] } ++ [("Accept", BS.intercalate ", " (map renderAccept $ reqAccept req))
| not . null . reqAccept $ req] }
renderAccept :: MediaType -> BS.ByteString renderAccept :: MediaType -> BS.ByteString
renderAccept m = BSC.pack (show m) renderAccept m = BSC.pack (show m)
toProperHeader (name, val) = toProperHeader (name, val) =