6e6e918 · typeable/wai

wai-extra/Network/Wai/Middleware/RequestLogger.hs−1

compare with master

unifiedsplit

@@ -30,7 +30,6 @@ import Network.HTTP.Types as H

30import Data.Maybe (fromMaybe)

31import Control.Monad.Trans.Resource (withInternalState)

32import Data.Monoid (mconcat)

33−import Blaze.ByteString.Builder (toByteString)

34

33

35import Network.Wai.Parse (sinkRequestBody, lbsBackEnd, fileName, Param, File, getRequestBodyType)

34import Network.Wai.Parse (sinkRequestBody, lbsBackEnd, fileName, Param, File, getRequestBodyType)

36import qualified Data.ByteString.Lazy as LBS

35import qualified Data.ByteString.Lazy as LBS

wai-extra/Network/Wai/Middleware/RequestLogger/Internal.hs+15−1

@@ -2,10 +2,24 @@

2-- | A module for containing some CPPed code, due to:

3--

4-- 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

6

9

7import Data.ByteString (ByteString)

10import Data.ByteString (ByteString)

8import Network.Wai.Logger (clockDateCacher)

11import Network.Wai.Logger (clockDateCacher)

9

12

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+

10getDateGetter :: IO (IO ByteString)

24getDateGetter :: IO (IO ByteString)

11getDateGetter = fmap fst clockDateCacher

25getDateGetter = fmap fst clockDateCacher

wai-extra/wai-extra.cabal+1−1

@@ -1,5 +1,5 @@

1Name: wai-extra

2−Version: 2.0.1

2+Version: 2.0.1.1

3Synopsis: Provides some basic WAI handlers and middleware.

4Description: The goal here is to provide common features without many dependencies.

5License: MIT