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

Match wai renamings

Browse Source
This commit is contained in:
Michael Snoyman 2010-02-11 20:55:19 +02:00
parent f0c16f1a72
commit 784675919b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Yesod/Request.hs
View File

@ -112,9 +112,9 @@ cookies rr name = map snd . filter (fst `equals` name) . rawCookies $ rr
parseWaiRequest :: W.Request -> [(B.ByteString, B.ByteString)] -> IO RawRequest parseWaiRequest :: W.Request -> [(B.ByteString, B.ByteString)] -> IO RawRequest
parseWaiRequest env session = do parseWaiRequest env session = do
let gets' = map (cs *** cs) $ decodeUrlPairs $ W.queryString env let gets' = map (cs *** cs) $ decodeUrlPairs $ W.queryString env
let rawCookie = fromMaybe B.empty $ lookup W.Cookie $ W.httpHeaders env let rawCookie = fromMaybe B.empty $ lookup W.Cookie $ W.requestHeaders env
cookies' = map (cs *** cs) $ parseCookies rawCookie cookies' = map (cs *** cs) $ parseCookies rawCookie
acceptLang = lookup W.AcceptLanguage $ W.httpHeaders env acceptLang = lookup W.AcceptLanguage $ W.requestHeaders env
langs = map cs $ maybe [] parseHttpAccept acceptLang langs = map cs $ maybe [] parseHttpAccept acceptLang
langs' = case lookup langKey cookies' of langs' = case lookup langKey cookies' of
Nothing -> langs Nothing -> langs
@ -132,8 +132,8 @@ rbHelper mvar = modifyMVar mvar helper where
helper (Left env) = do helper (Left env) = do
inputLBS <- WE.toLBS $ W.requestBody env -- FIXME inputLBS <- WE.toLBS $ W.requestBody env -- FIXME
let clength = maybe "0" cs $ lookup W.ReqContentLength let clength = maybe "0" cs $ lookup W.ReqContentLength
$ W.httpHeaders env $ W.requestHeaders env
let ctype = maybe "" cs $ lookup W.ReqContentType $ W.httpHeaders env let ctype = maybe "" cs $ lookup W.ReqContentType $ W.requestHeaders env
let convertFileInfo (FileInfo a b c) = FileInfo (cs a) (cs b) c let convertFileInfo (FileInfo a b c) = FileInfo (cs a) (cs b) c
let ret = map (cs *** cs) *** let ret = map (cs *** cs) ***
map (cs *** convertFileInfo) map (cs *** convertFileInfo)

2
Yesod/Yesod.hs
View File

@ -131,4 +131,4 @@ httpAccept = map contentTypeFromBS
. parseHttpAccept . parseHttpAccept
. fromMaybe B.empty . fromMaybe B.empty
. lookup W.Accept . lookup W.Accept
. W.httpHeaders . W.requestHeaders