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

persistent 2.1 and warp 3.0.2

Browse Source
This commit is contained in:
Michael Snoyman 2014-09-30 06:57:38 +03:00
parent d98061408a
commit 9ce4d49d0a
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yesod-auth/yesod-auth.cabal
View File

@ -45,8 +45,8 @@ library
, unordered-containers , unordered-containers
, yesod-form >= 1.4 && < 1.5 , yesod-form >= 1.4 && < 1.5
, transformers >= 0.2.2 , transformers >= 0.2.2
, persistent >= 1.2 && < 2.1 , persistent >= 2.1 && < 2.2
, persistent-template >= 1.2 && < 2.1 , persistent-template >= 2.1 && < 2.2
, http-conduit >= 1.5 , http-conduit >= 1.5
, aeson >= 0.7 , aeson >= 0.7
, lifted-base >= 0.1 , lifted-base >= 0.1

6
yesod-core/Yesod/Core/Dispatch.hs
View File

@ -96,7 +96,6 @@ toWaiAppYre yre req =
sendResponse $ W.responseLBS status301 sendResponse $ W.responseLBS status301
[ ("Content-Type", "text/plain") [ ("Content-Type", "text/plain")
, ("Location", Blaze.ByteString.Builder.toByteString dest') , ("Location", Blaze.ByteString.Builder.toByteString dest')
-- FIXME , ("Server", serverValue)
] "Redirecting" ] "Redirecting"
where where
dest = joinPath y (resolveApproot y env) segments' [] dest = joinPath y (resolveApproot y env) segments' []
@ -155,6 +154,7 @@ warp port site = do
logger <- makeLogger site logger <- makeLogger site
toWaiAppLogger logger site >>= Network.Wai.Handler.Warp.runSettings ( toWaiAppLogger logger site >>= Network.Wai.Handler.Warp.runSettings (
Network.Wai.Handler.Warp.setPort port $ Network.Wai.Handler.Warp.setPort port $
Network.Wai.Handler.Warp.setServerName serverValue $
Network.Wai.Handler.Warp.setOnException (\_ e -> Network.Wai.Handler.Warp.setOnException (\_ e ->
when (shouldLog' e) $ when (shouldLog' e) $
messageLoggerSource messageLoggerSource
@ -168,8 +168,8 @@ warp port site = do
where where
shouldLog' = Network.Wai.Handler.Warp.defaultShouldDisplayException shouldLog' = Network.Wai.Handler.Warp.defaultShouldDisplayException
_serverValue :: S8.ByteString -- FIXME serverValue :: S8.ByteString
_serverValue = S8.pack $ concat serverValue = S8.pack $ concat
[ "Warp/" [ "Warp/"
, Network.Wai.Handler.Warp.warpVersion , Network.Wai.Handler.Warp.warpVersion
, " + Yesod/" , " + Yesod/"

2
yesod-core/yesod-core.cabal
View File

@ -60,7 +60,7 @@ library
, blaze-markup >= 0.5.1 , blaze-markup >= 0.5.1
, data-default , data-default
, safe , safe
, warp >= 1.3.8 , warp >= 3.0.2
, unix-compat , unix-compat
, conduit-extra , conduit-extra
, exceptions >= 0.6 , exceptions >= 0.6

4
yesod-persistent/yesod-persistent.cabal
View File

@ -15,8 +15,8 @@ description: Some helpers for using Persistent from Yesod.
library library
build-depends: base >= 4 && < 5 build-depends: base >= 4 && < 5
, yesod-core >= 1.4.0 && < 1.5 , yesod-core >= 1.4.0 && < 1.5
, persistent >= 2.0 && < 2.1 , persistent >= 2.1 && < 2.2
, persistent-template >= 2.0 && < 2.1 , persistent-template >= 2.1 && < 2.2
, transformers >= 0.2.2 , transformers >= 0.2.2
, blaze-builder , blaze-builder
, conduit , conduit