git.iko.soy/typeable/wai
on master help sign in
removing connReadBuffer from Connection.
commit27f2c4e343562b343706c544abbada52b1412a2e authorKazu Yamamoto <kazu@iij.ad.jp> dateWed 10 Jun 2015, 13:57 (11 years ago) parentd2f9620
3 files changed+4−11
compare with master
unifiedsplit
warp-tls/Network/Wai/Handler/WarpTLS.hs+3−6 warp/Network/Wai/Handler/Warp/Run.hs−2 warp/Network/Wai/Handler/Warp/Types.hs+1−3
warp-tls/Network/Wai/Handler/WarpTLS.hs+3−6
@@ -272,10 +272,9 @@ httpOverTls TLSSettings{..} s cachedRef params = do
272272 ctx <- TLS.contextNew backend params gen
273273 TLS.contextHookSetLogging ctx tlsLogging
274274 TLS.handshake ctx
275− readBuf <- allocateBuffer bufferSize
276275 writeBuf <- allocateBuffer bufferSize
277276 tls <- getTLSinfo ctx
278− return (conn ctx readBuf writeBuf, tls)
277+ return (conn ctx writeBuf, tls)
279278 where
280279 backend = TLS.Backend {
281280 TLS.backendFlush = return ()
@@ -283,14 +282,13 @@ httpOverTls TLSSettings{..} s cachedRef params = do
283282 , TLS.backendSend = sendAll s
284283 , TLS.backendRecv = recvTLS cachedRef s
285284 }
286− conn ctx readBuf writeBuf = Connection {
285+ conn ctx writeBuf = Connection {
287286 connSendMany = TLS.sendData ctx . L.fromChunks
288287 , connSendAll = TLS.sendData ctx . L.fromChunks . return
289288 , connSendFile = sendfile
290289 , connClose = close
291290 , connRecv = recv
292291 , connSendFileOverride = NotOverride
293− , connReadBuffer = readBuf
294292 , connWriteBuffer = writeBuf
295293 , connBufferSize = bufferSize
296294 }
@@ -310,8 +308,7 @@ httpOverTls TLSSettings{..} s cachedRef params = do
310308 void $ tickle' -- This tickles the Timer. It MUST be called per chunk.
311309 loop h $ remaining - B.length x
312310
313− close = freeBuffer readBuf `finally`
314− freeBuffer writeBuf `finally`
311+ close = freeBuffer writeBuf `finally`
315312 void (tryIO $ TLS.bye ctx) `finally`
316313 TLS.contextClose ctx
317314
warp/Network/Wai/Handler/Warp/Run.hs−2
@@ -49,7 +49,6 @@ import Network.Socket (fdSocket)
4949socketConnection :: Socket -> IO Connection
5050socketConnection s = do
5151 bufferPool <- newBufferPool
52− readBuf <- allocateBuffer 0 -- kept for backward compatibility
5352 writeBuf <- allocateBuffer bufferSize
5453 return Connection {
5554 connSendMany = Sock.sendMany s
@@ -58,7 +57,6 @@ socketConnection s = do
5857 , connClose = sClose s >> freeBuffer writeBuf
5958 , connRecv = receive s bufferPool
6059 , connBufferPool = bufferPool
61− , connReadBuffer = readBuf
6260 , connWriteBuffer = writeBuf
6361 , connBufferSize = bufferSize
6462 , connSendFileOverride = Override s
warp/Network/Wai/Handler/Warp/Types.hs+1−3
@@ -80,10 +80,8 @@ data Connection = Connection
8080 , connClose :: IO ()
8181 , connRecv :: IO ByteString
8282 , connBufferPool :: BufferPool
83− , connReadBuffer :: Buffer
84− -- ^ NOTE: This is kept just for backwards compatibility, and is no longer used at all.
8583 , connWriteBuffer :: Buffer
86− , connBufferSize :: BufSize
84+ , connBufferSize :: BufSize -- ^ The size of 'connWriteBuffer'
8785 , connSendFileOverride :: ConnSendFileOverride
8886 }
8987