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

Switched to parseRequestBody in web-encodings

Browse Source
This commit is contained in:
Snoyman 2010-03-04 04:37:58 -08:00
parent 70a06a8808
commit 465188e166
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Yesod/Request.hs
View File

@ -38,7 +38,6 @@ module Yesod.Request
) where
import qualified Network.Wai as W
import qualified Network.Wai.Source as WS
import Data.Function.Predicate (equals)
import Yesod.Definitions
import Web.Encodings
@ -137,16 +136,9 @@ parseWaiRequest env session = do
return $ RawRequest gets' cookies' session rbthunk env langs''
rbHelper :: W.Request -> IO RequestBodyContents
rbHelper env = do
inputLBS <- WS.toLBS $ W.requestBody env -- FIXME
let clength = maybe "0" cs $ lookup W.ReqContentLength
$ W.requestHeaders env
let ctype = maybe "" cs $ lookup W.ReqContentType $ W.requestHeaders env
let convertFileInfo (FileInfo a b c) = FileInfo (cs a) (cs b) c
let ret = map (cs *** cs) ***
map (cs *** convertFileInfo)
$ parsePost ctype clength inputLBS
return ret
rbHelper = fmap (fix1 *** map fix2) . parseRequestBody lbsSink where
fix1 = map (cs *** cs)
fix2 (x, FileInfo a b c) = (cs x, FileInfo (cs a) (cs b) c)
#if TEST
testSuite :: Test

2
yesod.cabal
View File

@ -38,7 +38,7 @@ library
authenticate >= 0.4.0 && < 0.5,
predicates >= 0.1 && < 0.2,
bytestring >= 0.9.1.4 && < 0.10,
web-encodings >= 0.2.3 && < 0.3,
web-encodings >= 0.4.0 && < 0.5,
data-object >= 0.2.0 && < 0.3,
data-object-yaml >= 0.2.0 && < 0.3,
directory >= 1 && < 1.1,