git.iko.soy/typeable/wai
on master help sign in
Reinstate connReadBuffer/connWriteBuffer #249
commitfb381bb4be01e42b026d818f8932480dbc79656a authorMichael Snoyman <michael@snoyman.com> dateThu 24 Apr 2014, 06:47 (12 years ago) parentb9d34aa
3 files changed+13−10
compare with master
unifiedsplit
warp/Network/Wai/Handler/Warp/Response.hs+5−5 warp/Network/Wai/Handler/Warp/Run.hs+6−4 warp/Network/Wai/Handler/Warp/Types.hs+2−1
warp/Network/Wai/Handler/Warp/Response.hs+5−5
@@ -12,7 +12,6 @@ module Network.Wai.Handler.Warp.Response (
1212 ) where
1313
1414import Blaze.ByteString.Builder (fromByteString, Builder, flush)
15−import Blaze.ByteString.Builder.Internal (defaultBufferSize)
1615import Blaze.ByteString.Builder.HTTP (chunkedTransferEncoding, chunkedTransferTerminator)
1716import Control.Applicative
1817import Control.Exception
@@ -25,7 +24,7 @@ import qualified Data.ByteString.Char8 as B (pack)
2524import qualified Data.CaseInsensitive as CI
2625import Data.Conduit
2726import qualified Data.Conduit.List as CL
28−import Data.Conduit.Blaze (builderToByteStringWith, allocBuffer, reuseBufferStrategy)
27+import Data.Conduit.Blaze (unsafeBuilderToByteString)
2928import Data.Function (on)
3029import Data.List (deleteBy)
3130import Data.Maybe (isJust, listToMaybe)
@@ -38,6 +37,7 @@ import Data.Version (showVersion)
3837import qualified Network.HTTP.Types as H
3938import Network.Wai
4039import qualified Network.Wai.Handler.Warp.Date as D
40+import Network.Wai.Handler.Warp.Buffer (toBlazeBuffer)
4141import Network.Wai.Handler.Warp.Header
4242import Network.Wai.Handler.Warp.IO (toBufIOWith)
4343import Network.Wai.Handler.Warp.ResponseHeader
@@ -237,7 +237,7 @@ sendRsp conn ver s hs restore (RspBuilder body needsChunked) = restore $ do
237237 | needsChunked = header <> chunkedTransferEncoding body
238238 <> chunkedTransferTerminator
239239 | otherwise = header <> body
240− buffer = connBuffer conn
240+ buffer = connWriteBuffer conn
241241 size = connBufferSize conn
242242 toBufIOWith buffer size (connSendAll conn) hdrBdy
243243
@@ -246,9 +246,9 @@ sendRsp conn ver s hs restore (RspBuilder body needsChunked) = restore $ do
246246sendRsp conn ver s hs restore (RspSource withBodyFlush needsChunked th) =
247247 withBodyFlush $ \bodyFlush -> restore $ do
248248 header <- composeHeaderBuilder ver s hs needsChunked
249+ buffer <- toBlazeBuffer (connWriteBuffer conn) (connBufferSize conn)
249250 let src = yield header >> cbody bodyFlush
250− strategy = reuseBufferStrategy $ allocBuffer defaultBufferSize
251− src $$ builderToByteStringWith strategy =$ connSink conn th
251+ src $$ unsafeBuilderToByteString (return buffer) =$ connSink conn th
252252 where
253253 cbody bodyFlush = if needsChunked then body $= chunk else body
254254 where
warp/Network/Wai/Handler/Warp/Run.hs+6−4
@@ -51,14 +51,16 @@ import Network.Socket (fdSocket)
5151-- | Default action value for 'Connection'.
5252socketConnection :: Socket -> IO Connection
5353socketConnection s = do
54− buf <- allocateBuffer bufferSize
54+ readBuf <- allocateBuffer bufferSize
55+ writeBuf <- allocateBuffer bufferSize
5556 return Connection {
5657 connSendMany = Sock.sendMany s
5758 , connSendAll = Sock.sendAll s
5859 , connSendFile = defaultSendFile s
59− , connClose = sClose s >> freeBuffer buf
60− , connRecv = receive s buf bufferSize
61− , connBuffer = buf
60+ , connClose = sClose s >> freeBuffer readBuf >> freeBuffer writeBuf
61+ , connRecv = receive s readBuf bufferSize
62+ , connReadBuffer = readBuf
63+ , connWriteBuffer = writeBuf
6264 , connBufferSize = bufferSize
6365 , connSendFileOverride = Override s
6466 }
warp/Network/Wai/Handler/Warp/Types.hs+2−1
@@ -74,7 +74,8 @@ data Connection = Connection
7474 , connSendFile :: FilePath -> Integer -> Integer -> IO () -> [ByteString] -> IO () -- ^ filepath, offset, length, hook action, HTTP headers
7575 , connClose :: IO ()
7676 , connRecv :: IO ByteString
77− , connBuffer :: Buffer
77+ , connReadBuffer :: Buffer
78+ , connWriteBuffer :: Buffer
7879 , connBufferSize :: BufSize
7980 , connSendFileOverride :: ConnSendFileOverride
8081 }