From 935912f31c344a3c49ce51a5109281651534d7ef Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 6 Feb 2012 08:46:51 +0200 Subject: [PATCH 1/7] cookie 0.4 --- yesod-core/Yesod/Internal/Core.hs | 2 +- yesod-core/yesod-core.cabal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yesod-core/Yesod/Internal/Core.hs b/yesod-core/Yesod/Internal/Core.hs index 6018642c..0eec2b07 100644 --- a/yesod-core/Yesod/Internal/Core.hs +++ b/yesod-core/Yesod/Internal/Core.hs @@ -414,7 +414,7 @@ defaultYesodRunner handler master sub murl toMasterRoute mkey req = do hs' = case mkey of Nothing -> hs - Just _ -> AddCookie SetCookie + Just _ -> AddCookie def { setCookieName = sessionName , setCookieValue = sessionVal , setCookiePath = Just (cookiePath master) diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index be247fad..005d1e21 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -69,7 +69,7 @@ library , containers >= 0.2 && < 0.5 , monad-control >= 0.3 && < 0.4 , transformers-base >= 0.4 - , cookie >= 0.3 && < 0.4 + , cookie >= 0.4 && < 0.5 , blaze-html >= 0.4.1.3 && < 0.5 , http-types >= 0.6.5 && < 0.7 , case-insensitive >= 0.2 From 0b6930fc23b1ee69b26b8e4ea0f75fab7f795888 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 7 Feb 2012 11:13:37 +0200 Subject: [PATCH 2/7] Fix openid test --- yesod-auth/openid.hs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/yesod-auth/openid.hs b/yesod-auth/openid.hs index 74105021..ebf1863d 100644 --- a/yesod-auth/openid.hs +++ b/yesod-auth/openid.hs @@ -11,8 +11,9 @@ import Text.Hamlet (hamlet) import Control.Monad.IO.Class (liftIO) import Yesod.Form import Network.Wai.Handler.Warp (run) +import Network.HTTP.Conduit -data BID = BID +data BID = BID { httpManager :: Manager } mkYesod "BID" [parseRoutes| / RootR GET @@ -44,11 +45,14 @@ instance YesodAuth BID where loginDest _ = AfterLoginR logoutDest _ = AuthR LoginR getAuthId = return . Just . credsIdent - authPlugins = [authOpenId] + authPlugins _ = [authOpenId] + authHttpManager = httpManager instance RenderMessage BID FormMessage where renderMessage _ _ = defaultFormMessage main :: IO () -main = toWaiApp BID >>= run 3000 +main = do + m <- newManager def + toWaiApp (BID m) >>= run 3000 From 3b59c48dbc37b94f002f33096283ad10f7b0c70b Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Tue, 7 Feb 2012 16:37:02 +0200 Subject: [PATCH 3/7] yepnope/modernizr is included in (#256) --- yesod-core/Yesod/Internal/Core.hs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yesod-core/Yesod/Internal/Core.hs b/yesod-core/Yesod/Internal/Core.hs index 0eec2b07..47f5dcaf 100644 --- a/yesod-core/Yesod/Internal/Core.hs +++ b/yesod-core/Yesod/Internal/Core.hs @@ -581,7 +581,11 @@ $forall s <- css