yesod-core 1.2.6.1 → 1.2.6.2
raw patch · 3 files changed
+21/−9 lines, 3 files
Files
- Yesod/Core/Handler.hs +16/−8
- Yesod/Core/Types.hs +4/−0
- yesod-core.cabal +1/−1
Yesod/Core/Handler.hs view
@@ -152,7 +152,7 @@ import qualified Control.Monad.Trans.Writer as Writer import Control.Monad.IO.Class (MonadIO, liftIO)-import Control.Monad.Trans.Resource (MonadResource, liftResourceT)+import Control.Monad.Trans.Resource (MonadResource, liftResourceT, InternalState) import qualified Network.HTTP.Types as H import qualified Network.Wai as W@@ -183,7 +183,7 @@ import Yesod.Core.Internal.Util (formatRFC1123) import Text.Blaze.Html (preEscapedToMarkup, toHtml) -import Control.Monad.Trans.Resource (ResourceT, runResourceT, withInternalState)+import Control.Monad.Trans.Resource (ResourceT, runResourceT, withInternalState, getInternalState, liftResourceT) import Data.Dynamic (fromDynamic, toDyn) import qualified Data.IORef.Lifted as I import Data.Maybe (listToMaybe)@@ -233,7 +233,10 @@ Just rbc -> return rbc Nothing -> do rr <- waiRequest-#if MIN_VERSION_wai(2, 0, 0)+#if MIN_VERSION_wai_extra(2, 0, 1)+ internalState <- liftResourceT getInternalState+ rbc <- liftIO $ rbHelper upload rr internalState+#elif MIN_VERSION_wai(2, 0, 0) rbc <- liftIO $ rbHelper upload rr #else rbc <- liftResourceT $ rbHelper upload rr@@ -242,15 +245,20 @@ return rbc #if MIN_VERSION_wai(2, 0, 0)-rbHelper :: FileUpload -> W.Request -> IO RequestBodyContents+rbHelper :: FileUpload -> W.Request -> InternalState -> IO RequestBodyContents+rbHelper upload req internalState = #else rbHelper :: FileUpload -> W.Request -> ResourceT IO RequestBodyContents+rbHelper upload req = #endif-rbHelper upload = case upload of- FileUploadMemory s -> rbHelper' s mkFileInfoLBS- FileUploadDisk s -> rbHelper' s mkFileInfoFile- FileUploadSource s -> rbHelper' s mkFileInfoSource+ FileUploadMemory s -> rbHelper' s mkFileInfoLBS req+#if MIN_VERSION_wai_extra(2, 0, 1)+ FileUploadDisk s -> rbHelper' (s internalState) mkFileInfoFile req+#else+ FileUploadDisk s -> rbHelper' s mkFileInfoFile req+#endif+ FileUploadSource s -> rbHelper' s mkFileInfoSource req rbHelper' :: NWP.BackEnd x -> (Text -> Text -> x -> FileInfo)
Yesod/Core/Types.hs view
@@ -134,7 +134,11 @@ } data FileUpload = FileUploadMemory !(NWP.BackEnd L.ByteString)+#if MIN_VERSION_wai_extra(2, 0, 1)+ | FileUploadDisk !(InternalState -> NWP.BackEnd FilePath)+#else | FileUploadDisk !(NWP.BackEnd FilePath)+#endif | FileUploadSource !(NWP.BackEnd (Source (ResourceT IO) ByteString)) -- | How to determine the root of the application for constructing URLs.
yesod-core.cabal view
@@ -1,5 +1,5 @@ name: yesod-core-version: 1.2.6.1+version: 1.2.6.2 license: MIT license-file: LICENSE author: Michael Snoyman <michael@snoyman.com>