yesod-core 1.2.6.6 → 1.2.6.7

raw patch · 3 files changed

+35/−16 lines, 3 files

Files

• Yesod/Core/Dispatch.hs +28/−14
• Yesod/Core/Handler.hs +6/−1
• yesod-core.cabal +1/−1

@@ -41,7 +41,7 @@  import Data.ByteString.Lazy.Char8 () -import Data.Text (Text)+import Data.Text (Text, pack) import Data.Monoid (mappend) import qualified Data.ByteString as S import qualified Data.ByteString.Char8 as S8@@ -118,6 +118,10 @@ toWaiApp :: YesodDispatch site => site -> IO W.Application toWaiApp site = do     logger <- makeLogger site+    toWaiAppLogger logger site++toWaiAppLogger :: YesodDispatch site => Logger -> site -> IO W.Application+toWaiAppLogger logger site = do     sb <- makeSessionBackend site     let yre = YesodRunnerEnv                 { yreLogger = logger@@ -144,19 +148,29 @@ -- -- Since 1.2.0 warp :: YesodDispatch site => Int -> site -> IO ()-warp port site = toWaiApp site >>= Network.Wai.Handler.Warp.runSettings-    Network.Wai.Handler.Warp.defaultSettings-        { Network.Wai.Handler.Warp.settingsPort = port-        {- FIXME-        , Network.Wai.Handler.Warp.settingsServerName = S8.pack $ concat-            [ "Warp/"-            , Network.Wai.Handler.Warp.warpVersion-            , " + Yesod/"-            , showVersion Paths_yesod_core.version-            , " (core)"-            ]-        -}-        }+warp port site = do+    logger <- makeLogger site+    toWaiAppLogger logger site >>= Network.Wai.Handler.Warp.runSettings+        Network.Wai.Handler.Warp.defaultSettings+            { Network.Wai.Handler.Warp.settingsPort = port+            {- FIXME+            , Network.Wai.Handler.Warp.settingsServerName = S8.pack $ concat+                [ "Warp/"+                , Network.Wai.Handler.Warp.warpVersion+                , " + Yesod/"+                , showVersion Paths_yesod_core.version+                , " (core)"+                ]+            -}+            , Network.Wai.Handler.Warp.settingsOnException = const $ \e ->+                messageLoggerSource+                    site+                    logger+                    $(qLocation >>= liftLoc)+                    "yesod-core"+                    LevelError+                    (toLogStr $ "Exception from Warp: " ++ show e)+            }  -- | A default set of middlewares. --

@@ -640,7 +640,12 @@ -- | Set the Expires header to some date in 2037. In other words, this content -- is never (realistically) expired. neverExpires :: MonadHandler m => m ()-neverExpires = setHeader "Expires" "Thu, 31 Dec 2037 23:55:55 GMT"+neverExpires = do+    setHeader "Expires" "Thu, 31 Dec 2037 23:55:55 GMT"+    cacheSeconds oneYear+  where+    oneYear :: Int+    oneYear = 60 * 60 * 24 * 365  -- | Set an Expires header in the past, meaning this content should not be -- cached.

@@ -1,5 +1,5 @@ name:            yesod-core-version:         1.2.6.6+version:         1.2.6.7 license:         MIT license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>