haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More robust parsing of Accept

Browse Source
This commit is contained in:
Bryan Richter 2012-01-14 11:12:03 -08:00
parent b2c715f223
commit 7bff503ebb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yesod-json/Yesod/Json.hs
View File

@ -44,7 +44,7 @@ import qualified Blaze.ByteString.Builder.Char.Utf8 as Blaze
import Data.Conduit (($$)) import Data.Conduit (($$))
import Network.Wai (requestBody, requestHeaders) import Network.Wai (requestBody, requestHeaders)
import Network.Wai.Parse (parseHttpAccept) import Network.Wai.Parse (parseHttpAccept)
import qualified Data.ByteString as B import qualified Data.ByteString.Char8 as B8
import Safe (headMay) import Safe (headMay)
instance ToContent J.Value where instance ToContent J.Value where
@ -119,7 +119,7 @@ jsonOrRedirect r j = do
if q then jsonToRepJson (J.toJSON j) if q then jsonToRepJson (J.toJSON j)
else redirect r else redirect r
where where
acceptsJson = maybe False ("application/json" `B.isPrefixOf`) acceptsJson = maybe False ((== "application/json") . B8.takeWhile (/= ';'))
. join . join
. fmap (headMay . parseHttpAccept) . fmap (headMay . parseHttpAccept)
. lookup "Accept" . requestHeaders . lookup "Accept" . requestHeaders