@@ -12,6 +12,7 @@ module Network.Wai.Handler.Warp.Response (
14import Blaze.ByteString.Builder (fromByteString, Builder, flush)
14import Blaze.ByteString.Builder (fromByteString, Builder, flush)
15+import Blaze.ByteString.Builder.Internal (defaultBufferSize)
15import Blaze.ByteString.Builder.HTTP (chunkedTransferEncoding, chunkedTransferTerminator)
16import Blaze.ByteString.Builder.HTTP (chunkedTransferEncoding, chunkedTransferTerminator)
16import Control.Applicative
17import Control.Applicative
17import Control.Exception
18import Control.Exception
@@ -24,7 +25,7 @@ import qualified Data.ByteString.Char8 as B (pack)
24import qualified Data.CaseInsensitive as CI
25import qualified Data.CaseInsensitive as CI
25import Data.Conduit
26import Data.Conduit
26import qualified Data.Conduit.List as CL
27import qualified Data.Conduit.List as CL
27−import Data.Conduit.Blaze (unsafeBuilderToByteString)
28+import Data.Conduit.Blaze (builderToByteStringWith, allocBuffer, reuseBufferStrategy)
28import Data.Function (on)
29import Data.Function (on)
29import Data.List (deleteBy)
30import Data.List (deleteBy)
30import Data.Maybe (isJust, listToMaybe)
31import Data.Maybe (isJust, listToMaybe)
@@ -38,7 +39,6 @@ import qualified Network.HTTP.Types as H
38import Network.Wai
39import Network.Wai
39import qualified Network.Wai.Handler.Warp.Date as D
40import qualified Network.Wai.Handler.Warp.Date as D
40import Network.Wai.Handler.Warp.Header
41import Network.Wai.Handler.Warp.Header
41−import Network.Wai.Handler.Warp.Buffer (toBlazeBuffer)
42import Network.Wai.Handler.Warp.IO (toBufIOWith)
42import Network.Wai.Handler.Warp.IO (toBufIOWith)
43import Network.Wai.Handler.Warp.ResponseHeader
43import Network.Wai.Handler.Warp.ResponseHeader
44import Network.Wai.Handler.Warp.RequestHeader (parseByteRanges)
44import Network.Wai.Handler.Warp.RequestHeader (parseByteRanges)
@@ -247,8 +247,8 @@ sendRsp conn ver s hs restore (RspSource withBodyFlush needsChunked th) =
247 withBodyFlush $ \bodyFlush -> restore $ do
247 withBodyFlush $ \bodyFlush -> restore $ do
248 header <- composeHeaderBuilder ver s hs needsChunked
248 header <- composeHeaderBuilder ver s hs needsChunked
249 let src = yield header >> cbody bodyFlush
249 let src = yield header >> cbody bodyFlush
250− buffer <- toBlazeBuffer (connBuffer conn) (connBufferSize conn)
250+ strategy = reuseBufferStrategy $ allocBuffer defaultBufferSize
251− src $$ unsafeBuilderToByteString (return buffer) =$ connSink conn th
251+ src $$ builderToByteStringWith strategy =$ connSink conn th
253 cbody bodyFlush = if needsChunked then body $= chunk else body
253 cbody bodyFlush = if needsChunked then body $= chunk else body