git.iko.soy/typeable/wai
on master help sign in
Remove unnecessary lazy ByteString usage
commitcbe73f9bf3eb573c51b45962c4db73ce6d950827 authorMichael Snoyman <michael@fpcomplete.com> dateFri 10 Jul 2015, 04:36 (11 years ago) parent1c9bb1e
2 files changed+5−8
compare with master
unifiedsplit
warp/Network/Wai/Handler/Warp/Conduit.hs−5 warp/Network/Wai/Handler/Warp/Settings.hs+5−3
warp/Network/Wai/Handler/Warp/Conduit.hs−5
@@ -5,9 +5,7 @@ module Network.Wai.Handler.Warp.Conduit where
55import Control.Exception
66import Control.Monad (when, unless)
77import Data.ByteString (ByteString)
8−import Data.ByteString.Lazy.Char8 (pack)
98import qualified Data.ByteString as S
10−import qualified Data.ByteString.Lazy as L
119import qualified Data.IORef as I
1210#if __GLASGOW_HASKELL__ < 709
1311import Data.Word (Word)
@@ -81,9 +79,6 @@ data ChunkState = NeedLen
8179 | DoneChunking
8280 deriving Show
8381
84−bsCRLF :: L.ByteString
85−bsCRLF = pack "\r\n"
86−
8782mkCSource :: Source -> IO CSource
8883mkCSource src = do
8984 ref <- I.newIORef NeedLen
warp/Network/Wai/Handler/Warp/Settings.hs+5−3
@@ -18,12 +18,13 @@ import Network.Wai.Handler.Warp.Timeout
1818import Network.Wai.Handler.Warp.Types
1919import System.IO (stderr)
2020import System.IO.Error (ioeGetErrorType)
21−import qualified Data.Text.Lazy as TL
22−import qualified Data.Text.Lazy.Encoding as TLE
2321import Data.ByteString (ByteString)
2422import qualified Data.ByteString.Char8 as S8
2523import Data.Version (showVersion)
2624import qualified Paths_warp
25+import Blaze.ByteString.Builder (copyByteString)
26+import Blaze.ByteString.Builder.Char.Utf8 (fromShow)
27+import Data.Monoid (mappend)
2728
2829-- | Various Warp server settings. This is purposely kept as an abstract data
2930-- type so that new settings can be added without breaking backwards
@@ -154,4 +155,5 @@ defaultOnExceptionResponse e
154155--
155156-- Since: 2.0.3.2
156157exceptionResponseForDebug :: SomeException -> Response
157−exceptionResponseForDebug e = responseLBS H.internalServerError500 [(H.hContentType, "text/plain; charset=utf-8")] (TLE.encodeUtf8 $ TL.pack $ "Exception: " ++ show e)
158+exceptionResponseForDebug e = responseBuilder H.internalServerError500 [(H.hContentType, "text/plain; charset=utf-8")]
159+ $ copyByteString "Exception: " `mappend` fromShow e