git.iko.soy/typeable/wai
on master help sign in
Work around changes in fast-logger #209
commit6e6e9184adbed4a9eac3a31d22016f29dd92a5cf authorMichael Snoyman <michael@snoyman.com> dateTue 24 Dec 2013, 17:12 (13 years ago) parent2ed89f1
3 files changed+16−3
compare with master
unifiedsplit
wai-extra/Network/Wai/Middleware/RequestLogger.hs−1 wai-extra/Network/Wai/Middleware/RequestLogger/Internal.hs+15−1 wai-extra/wai-extra.cabal+1−1
wai-extra/Network/Wai/Middleware/RequestLogger.hs−1
@@ -30,7 +30,6 @@ import Network.HTTP.Types as H
3030import Data.Maybe (fromMaybe)
3131import Control.Monad.Trans.Resource (withInternalState)
3232import Data.Monoid (mconcat)
33−import Blaze.ByteString.Builder (toByteString)
3433
3534import Network.Wai.Parse (sinkRequestBody, lbsBackEnd, fileName, Param, File, getRequestBodyType)
3635import qualified Data.ByteString.Lazy as LBS
wai-extra/Network/Wai/Middleware/RequestLogger/Internal.hs+15−1
@@ -2,10 +2,24 @@
22-- | A module for containing some CPPed code, due to:
33--
44-- https://github.com/yesodweb/wai/issues/192
5−module Network.Wai.Middleware.RequestLogger.Internal where
5+module Network.Wai.Middleware.RequestLogger.Internal
6+ ( module Network.Wai.Middleware.RequestLogger.Internal
7+ , toByteString
8+ ) where
69
710import Data.ByteString (ByteString)
811import Network.Wai.Logger (clockDateCacher)
912
13+#if MIN_VERSION_bytestring(0, 10, 2)
14+import Data.ByteString.Builder (toLazyByteString, Builder)
15+import qualified Data.ByteString.Lazy as L
16+
17+toByteString :: Builder -> ByteString
18+toByteString = L.toStrict . toLazyByteString
19+
20+#else
21+import Blaze.ByteString.Builder (toByteString)
22+#endif
23+
1024getDateGetter :: IO (IO ByteString)
1125getDateGetter = fmap fst clockDateCacher
wai-extra/wai-extra.cabal+1−1
@@ -1,5 +1,5 @@
11Name: wai-extra
2−Version: 2.0.1
2+Version: 2.0.1.1
33Synopsis: Provides some basic WAI handlers and middleware.
44Description: The goal here is to provide common features without many dependencies.
55License: MIT