This commit is contained in:
Michael Snoyman 2012-01-26 15:56:13 +02:00
parent 6e52853c76
commit 9b92215819
9 changed files with 17 additions and 17 deletions

View File

@ -24,7 +24,7 @@ library
build-depends: authenticate >= 1.0 && < 1.1 build-depends: authenticate >= 1.0 && < 1.1
, bytestring >= 0.9.1.4 && < 0.10 , bytestring >= 0.9.1.4 && < 0.10
, yesod-core >= 0.10 && < 0.11 , yesod-core >= 0.10 && < 0.11
, wai >= 1.0 && < 1.1 , wai >= 1.1 && < 1.2
, template-haskell , template-haskell
, pureMD5 >= 2.0 && < 2.2 , pureMD5 >= 2.0 && < 2.2
, random >= 1.0.0.2 && < 1.1 , random >= 1.0.0.2 && < 1.1

View File

@ -61,10 +61,10 @@ import Text.Hamlet (Html)
import Text.Blaze.Renderer.Utf8 (renderHtmlBuilder) import Text.Blaze.Renderer.Utf8 (renderHtmlBuilder)
import Data.String (IsString (fromString)) import Data.String (IsString (fromString))
import Network.Wai (FilePart) import Network.Wai (FilePart)
import Data.Conduit (Source) import Data.Conduit (Source, Flush)
data Content = ContentBuilder Builder (Maybe Int) -- ^ The content and optional content length. data Content = ContentBuilder Builder (Maybe Int) -- ^ The content and optional content length.
| ContentSource (Source IO Builder) | ContentSource (Source IO (Flush Builder))
| ContentFile FilePath (Maybe FilePart) | ContentFile FilePath (Maybe FilePart)
-- | Zero-length enumerator. -- | Zero-length enumerator.

View File

@ -326,7 +326,7 @@ rbHelper :: W.Request -> ResourceT IO RequestBodyContents
rbHelper req = rbHelper req =
(map fix1 *** map fix2) <$> (requestBody req $$ iter) (map fix1 *** map fix2) <$> (requestBody req $$ iter)
where where
iter = NWP.parseRequestBody NWP.lbsSink req iter = NWP.parseRequestBody NWP.lbsBackEnd req
fix1 = go *** go fix1 = go *** go
fix2 (x, NWP.FileInfo a b c) = fix2 (x, NWP.FileInfo a b c) =
(go x, FileInfo (go a) (go b) c) (go x, FileInfo (go a) (go b) c)

View File

@ -48,8 +48,8 @@ library
build-depends: time >= 1.1.4 build-depends: time >= 1.1.4
, yesod-routes >= 0.0 && < 0.1 , yesod-routes >= 0.0 && < 0.1
, wai >= 1.0 && < 1.1 , wai >= 1.1 && < 1.2
, wai-extra >= 1.0 && < 1.1 , wai-extra >= 1.1 && < 1.2
, bytestring >= 0.9.1.4 && < 0.10 , bytestring >= 0.9.1.4 && < 0.10
, text >= 0.7 && < 0.12 , text >= 0.7 && < 0.12
, template-haskell , template-haskell

View File

@ -19,9 +19,9 @@ library
build-depends: base >= 4 && < 5 build-depends: base >= 4 && < 5
, yesod-core >= 0.10 && < 0.11 , yesod-core >= 0.10 && < 0.11
, warp >= 1.0 && < 1.1 , warp >= 1.1 && < 1.2
, wai >= 1.0 && < 1.1 , wai >= 1.1 && < 1.2
, wai-extra >= 1.0 && < 1.1 , wai-extra >= 1.1 && < 1.2
, bytestring >= 0.9.1.4 , bytestring >= 0.9.1.4
, transformers >= 0.2.2 && < 0.3 , transformers >= 0.2.2 && < 0.3
, text >= 0.9 , text >= 0.9

View File

@ -31,7 +31,7 @@ library
, blaze-html >= 0.4.1.3 && < 0.5 , blaze-html >= 0.4.1.3 && < 0.5
, bytestring >= 0.9.1.4 && < 0.10 , bytestring >= 0.9.1.4 && < 0.10
, text >= 0.9 && < 1.0 , text >= 0.9 && < 1.0
, wai >= 1.0 && < 1.1 , wai >= 1.1 && < 1.2
, containers >= 0.2 && < 0.5 , containers >= 0.2 && < 0.5
exposed-modules: Yesod.Form exposed-modules: Yesod.Form
Yesod.Form.Class Yesod.Form.Class

View File

@ -25,8 +25,8 @@ library
, attoparsec-conduit >= 0.0 && < 0.1 , attoparsec-conduit >= 0.0 && < 0.1
, conduit >= 0.0 && < 0.2 , conduit >= 0.0 && < 0.2
, transformers >= 0.2.2 && < 0.3 , transformers >= 0.2.2 && < 0.3
, wai >= 1.0 && < 1.1 , wai >= 1.1 && < 1.2
, wai-extra >= 1.0 && < 1.1 , wai-extra >= 1.1 && < 1.2
, bytestring >= 0.9 && < 0.10 , bytestring >= 0.9 && < 0.10
, safe >= 0.2 && < 0.4 , safe >= 0.2 && < 0.4
exposed-modules: Yesod.Json exposed-modules: Yesod.Json

View File

@ -33,8 +33,8 @@ library
, template-haskell , template-haskell
, directory >= 1.0 && < 1.2 , directory >= 1.0 && < 1.2
, transformers >= 0.2.2 && < 0.3 , transformers >= 0.2.2 && < 0.3
, wai-app-static >= 1.0 && < 1.1 , wai-app-static >= 1.1 && < 1.2
, wai >= 1.0 && < 1.1 , wai >= 1.1 && < 1.2
, text >= 0.9 && < 1.0 , text >= 0.9 && < 1.0
, file-embed >= 0.0.4.1 && < 0.5 , file-embed >= 0.0.4.1 && < 0.5
, http-types >= 0.6.5 && < 0.7 , http-types >= 0.6.5 && < 0.7

View File

@ -79,13 +79,13 @@ library
, yesod-form >= 0.4 && < 0.5 , yesod-form >= 0.4 && < 0.5
, monad-control >= 0.3 && < 0.4 , monad-control >= 0.3 && < 0.4
, transformers >= 0.2.2 && < 0.3 , transformers >= 0.2.2 && < 0.3
, wai >= 1.0 && < 1.1 , wai >= 1.1 && < 1.2
, wai-extra >= 1.0 && < 1.1 , wai-extra >= 1.1 && < 1.2
, wai-logger >= 0.1.2 , wai-logger >= 0.1.2
, hamlet >= 0.10 && < 0.11 , hamlet >= 0.10 && < 0.11
, shakespeare-js >= 0.10 && < 0.11 , shakespeare-js >= 0.10 && < 0.11
, shakespeare-css >= 0.10 && < 0.11 , shakespeare-css >= 0.10 && < 0.11
, warp >= 1.0 && < 1.1 , warp >= 1.1 && < 1.2
, blaze-html >= 0.4.1.3 && < 0.5 , blaze-html >= 0.4.1.3 && < 0.5
exposed-modules: Yesod exposed-modules: Yesod
ghc-options: -Wall ghc-options: -Wall