From 9b92215819394426ff28fa0477d80557c6fcaab0 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 26 Jan 2012 15:56:13 +0200 Subject: [PATCH] WAI 1.1 --- yesod-auth/yesod-auth.cabal | 2 +- yesod-core/Yesod/Content.hs | 4 ++-- yesod-core/Yesod/Handler.hs | 2 +- yesod-core/yesod-core.cabal | 4 ++-- yesod-default/yesod-default.cabal | 6 +++--- yesod-form/yesod-form.cabal | 2 +- yesod-json/yesod-json.cabal | 4 ++-- yesod-static/yesod-static.cabal | 4 ++-- yesod/yesod.cabal | 6 +++--- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/yesod-auth/yesod-auth.cabal b/yesod-auth/yesod-auth.cabal index 174e543f..92a1661f 100644 --- a/yesod-auth/yesod-auth.cabal +++ b/yesod-auth/yesod-auth.cabal @@ -24,7 +24,7 @@ library build-depends: authenticate >= 1.0 && < 1.1 , bytestring >= 0.9.1.4 && < 0.10 , yesod-core >= 0.10 && < 0.11 - , wai >= 1.0 && < 1.1 + , wai >= 1.1 && < 1.2 , template-haskell , pureMD5 >= 2.0 && < 2.2 , random >= 1.0.0.2 && < 1.1 diff --git a/yesod-core/Yesod/Content.hs b/yesod-core/Yesod/Content.hs index 292859ac..41afaee0 100644 --- a/yesod-core/Yesod/Content.hs +++ b/yesod-core/Yesod/Content.hs @@ -61,10 +61,10 @@ import Text.Hamlet (Html) import Text.Blaze.Renderer.Utf8 (renderHtmlBuilder) import Data.String (IsString (fromString)) 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. - | ContentSource (Source IO Builder) + | ContentSource (Source IO (Flush Builder)) | ContentFile FilePath (Maybe FilePart) -- | Zero-length enumerator. diff --git a/yesod-core/Yesod/Handler.hs b/yesod-core/Yesod/Handler.hs index 4eb71197..a9410596 100644 --- a/yesod-core/Yesod/Handler.hs +++ b/yesod-core/Yesod/Handler.hs @@ -326,7 +326,7 @@ rbHelper :: W.Request -> ResourceT IO RequestBodyContents rbHelper req = (map fix1 *** map fix2) <$> (requestBody req $$ iter) where - iter = NWP.parseRequestBody NWP.lbsSink req + iter = NWP.parseRequestBody NWP.lbsBackEnd req fix1 = go *** go fix2 (x, NWP.FileInfo a b c) = (go x, FileInfo (go a) (go b) c) diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index 632c86e8..40c9ad1d 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -48,8 +48,8 @@ library build-depends: time >= 1.1.4 , yesod-routes >= 0.0 && < 0.1 - , wai >= 1.0 && < 1.1 - , wai-extra >= 1.0 && < 1.1 + , wai >= 1.1 && < 1.2 + , wai-extra >= 1.1 && < 1.2 , bytestring >= 0.9.1.4 && < 0.10 , text >= 0.7 && < 0.12 , template-haskell diff --git a/yesod-default/yesod-default.cabal b/yesod-default/yesod-default.cabal index bc10f56d..c008cf0e 100644 --- a/yesod-default/yesod-default.cabal +++ b/yesod-default/yesod-default.cabal @@ -19,9 +19,9 @@ library build-depends: base >= 4 && < 5 , yesod-core >= 0.10 && < 0.11 - , warp >= 1.0 && < 1.1 - , wai >= 1.0 && < 1.1 - , wai-extra >= 1.0 && < 1.1 + , warp >= 1.1 && < 1.2 + , wai >= 1.1 && < 1.2 + , wai-extra >= 1.1 && < 1.2 , bytestring >= 0.9.1.4 , transformers >= 0.2.2 && < 0.3 , text >= 0.9 diff --git a/yesod-form/yesod-form.cabal b/yesod-form/yesod-form.cabal index 0a45d0ad..4fd35dc2 100644 --- a/yesod-form/yesod-form.cabal +++ b/yesod-form/yesod-form.cabal @@ -31,7 +31,7 @@ library , blaze-html >= 0.4.1.3 && < 0.5 , bytestring >= 0.9.1.4 && < 0.10 , text >= 0.9 && < 1.0 - , wai >= 1.0 && < 1.1 + , wai >= 1.1 && < 1.2 , containers >= 0.2 && < 0.5 exposed-modules: Yesod.Form Yesod.Form.Class diff --git a/yesod-json/yesod-json.cabal b/yesod-json/yesod-json.cabal index 16d263e2..e3dc99e5 100644 --- a/yesod-json/yesod-json.cabal +++ b/yesod-json/yesod-json.cabal @@ -25,8 +25,8 @@ library , attoparsec-conduit >= 0.0 && < 0.1 , conduit >= 0.0 && < 0.2 , transformers >= 0.2.2 && < 0.3 - , wai >= 1.0 && < 1.1 - , wai-extra >= 1.0 && < 1.1 + , wai >= 1.1 && < 1.2 + , wai-extra >= 1.1 && < 1.2 , bytestring >= 0.9 && < 0.10 , safe >= 0.2 && < 0.4 exposed-modules: Yesod.Json diff --git a/yesod-static/yesod-static.cabal b/yesod-static/yesod-static.cabal index 5feaa91d..c011e339 100644 --- a/yesod-static/yesod-static.cabal +++ b/yesod-static/yesod-static.cabal @@ -33,8 +33,8 @@ library , template-haskell , directory >= 1.0 && < 1.2 , transformers >= 0.2.2 && < 0.3 - , wai-app-static >= 1.0 && < 1.1 - , wai >= 1.0 && < 1.1 + , wai-app-static >= 1.1 && < 1.2 + , wai >= 1.1 && < 1.2 , text >= 0.9 && < 1.0 , file-embed >= 0.0.4.1 && < 0.5 , http-types >= 0.6.5 && < 0.7 diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal index a4c8a34a..49a69ed0 100644 --- a/yesod/yesod.cabal +++ b/yesod/yesod.cabal @@ -79,13 +79,13 @@ library , yesod-form >= 0.4 && < 0.5 , monad-control >= 0.3 && < 0.4 , transformers >= 0.2.2 && < 0.3 - , wai >= 1.0 && < 1.1 - , wai-extra >= 1.0 && < 1.1 + , wai >= 1.1 && < 1.2 + , wai-extra >= 1.1 && < 1.2 , wai-logger >= 0.1.2 , hamlet >= 0.10 && < 0.11 , shakespeare-js >= 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 exposed-modules: Yesod ghc-options: -Wall