27f2c4e · typeable/wai

git.iko.soy/typeable/wai

on master help sign in

removing connReadBuffer from Connection.

27f2c4eKazu Yamamoto11 years ago

warp-tls/Network/Wai/Handler/WarpTLS.hs+3−6

compare with master

unifiedsplit

@@ -272,10 +272,9 @@ httpOverTls TLSSettings{..} s cachedRef params = do

272 ctx <- TLS.contextNew backend params gen

273 TLS.contextHookSetLogging ctx tlsLogging

274 TLS.handshake ctx

275− readBuf <- allocateBuffer bufferSize

276 writeBuf <- allocateBuffer bufferSize

275 writeBuf <- allocateBuffer bufferSize

277 tls <- getTLSinfo ctx

276 tls <- getTLSinfo ctx

278− return (conn ctx readBuf writeBuf, tls)

277+ return (conn ctx writeBuf, tls)

279 where

278 where

280 backend = TLS.Backend {

279 backend = TLS.Backend {

281 TLS.backendFlush = return ()

280 TLS.backendFlush = return ()

@@ -283,14 +282,13 @@ httpOverTls TLSSettings{..} s cachedRef params = do

283 , TLS.backendSend = sendAll s

282 , TLS.backendSend = sendAll s

284 , TLS.backendRecv = recvTLS cachedRef s

283 , TLS.backendRecv = recvTLS cachedRef s

285 }

284 }

286− conn ctx readBuf writeBuf = Connection {

285+ conn ctx writeBuf = Connection {

287 connSendMany = TLS.sendData ctx . L.fromChunks

286 connSendMany = TLS.sendData ctx . L.fromChunks

288 , connSendAll = TLS.sendData ctx . L.fromChunks . return

287 , connSendAll = TLS.sendData ctx . L.fromChunks . return

289 , connSendFile = sendfile

288 , connSendFile = sendfile

290 , connClose = close

289 , connClose = close

291 , connRecv = recv

290 , connRecv = recv

292 , connSendFileOverride = NotOverride

291 , connSendFileOverride = NotOverride

293− , connReadBuffer = readBuf

294 , connWriteBuffer = writeBuf

292 , connWriteBuffer = writeBuf

295 , connBufferSize = bufferSize

293 , connBufferSize = bufferSize

296 }

294 }

@@ -310,8 +308,7 @@ httpOverTls TLSSettings{..} s cachedRef params = do

310 void $ tickle' -- This tickles the Timer. It MUST be called per chunk.

308 void $ tickle' -- This tickles the Timer. It MUST be called per chunk.

311 loop h $ remaining - B.length x

309 loop h $ remaining - B.length x

312

310

313− close = freeBuffer readBuf `finally`

314− freeBuffer writeBuf `finally`

311+ close = freeBuffer writeBuf `finally`

315 void (tryIO $ TLS.bye ctx) `finally`

312 void (tryIO $ TLS.bye ctx) `finally`

316 TLS.contextClose ctx

313 TLS.contextClose ctx

317

314

warp/Network/Wai/Handler/Warp/Run.hs−2

@@ -49,7 +49,6 @@ import Network.Socket (fdSocket)

49socketConnection :: Socket -> IO Connection

50socketConnection s = do

51 bufferPool <- newBufferPool

52− readBuf <- allocateBuffer 0 -- kept for backward compatibility

53 writeBuf <- allocateBuffer bufferSize

52 writeBuf <- allocateBuffer bufferSize

54 return Connection {

53 return Connection {

55 connSendMany = Sock.sendMany s

54 connSendMany = Sock.sendMany s

@@ -58,7 +57,6 @@ socketConnection s = do

58 , connClose = sClose s >> freeBuffer writeBuf

57 , connClose = sClose s >> freeBuffer writeBuf

59 , connRecv = receive s bufferPool

58 , connRecv = receive s bufferPool

60 , connBufferPool = bufferPool

59 , connBufferPool = bufferPool

61− , connReadBuffer = readBuf

62 , connWriteBuffer = writeBuf

60 , connWriteBuffer = writeBuf

63 , connBufferSize = bufferSize

61 , connBufferSize = bufferSize

64 , connSendFileOverride = Override s

62 , connSendFileOverride = Override s

warp/Network/Wai/Handler/Warp/Types.hs+1−3

@@ -80,10 +80,8 @@ data Connection = Connection

80 , connClose :: IO ()

81 , connRecv :: IO ByteString

82 , connBufferPool :: BufferPool

83− , connReadBuffer :: Buffer

84− -- ^ NOTE: This is kept just for backwards compatibility, and is no longer used at all.

85 , connWriteBuffer :: Buffer

83 , connWriteBuffer :: Buffer

86− , connBufferSize :: BufSize

84+ , connBufferSize :: BufSize -- ^ The size of 'connWriteBuffer'

87 , connSendFileOverride :: ConnSendFileOverride

85 , connSendFileOverride :: ConnSendFileOverride

88 }

86 }