on master help sign in
Fix warp-tls for recent warp changes
commitfcb6df8743f2eddc81c9700a09ebc0f78768b886 authorMichael Snoyman <michael@snoyman.com> dateThu 24 Apr 2014, 08:07 (12 years ago) parent7d1817b
3 files changed+9−5
warp-tls/Network/Wai/Handler/WarpTLS.hs+6−2 warp-tls/warp-tls.cabal+2−2 warp/warp.cabal+1−1
warp-tls/Network/Wai/Handler/WarpTLS.hs+6−2
@@ -150,7 +150,8 @@ runTLSSocket TLSSettings {..} set sock app = do
150150 gen
151151 TLS.contextHookSetLogging ctx tlsLogging
152152 TLS.handshake ctx
153− buf <- allocateBuffer bufferSize
153+ readBuf <- allocateBuffer bufferSize
154+ writeBuf <- allocateBuffer bufferSize
154155 let conn = Connection
155156 { connSendMany = TLS.sendData ctx . L.fromChunks
156157 , connSendAll = TLS.sendData ctx . L.fromChunks . return
@@ -158,6 +159,8 @@ runTLSSocket TLSSettings {..} set sock app = do
158159 TLS.sendData ctx $ L.fromChunks headers
159160 runResourceT $ sourceFileRange fp (Just offset) (Just len) C.$$ CL.mapM_ (TLS.sendData ctx . L.fromChunks . return)
160161 , connClose =
162+ freeBuffer readBuf `finally`
163+ freeBuffer writeBuf `finally`
161164 TLS.bye ctx `finally`
162165 TLS.contextClose ctx
163166 , connRecv =
@@ -170,7 +173,8 @@ runTLSSocket TLSSettings {..} set sock app = do
170173 else return x
171174 in go
172175 , connSendFileOverride = NotOverride
173− , connBuffer = buf
176+ , connReadBuffer = readBuf
177+ , connWriteBuffer = writeBuf
174178 , connBufferSize = bufferSize
175179 }
176180 return (conn, True)
warp-tls/warp-tls.cabal+2−2
@@ -1,5 +1,5 @@
11Name: warp-tls
2−Version: 2.0.4
2+Version: 2.0.5
33Synopsis: HTTP over SSL/TLS support for Warp via the TLS package
44License: MIT
55License-file: LICENSE
@@ -16,7 +16,7 @@ Library
1616 Build-Depends: base >= 4 && < 5
1717 , bytestring >= 0.9
1818 , wai >= 2.0 && < 2.2
19− , warp >= 2.1.4 && < 2.2
19+ , warp >= 2.1.5 && < 2.2
2020 , transformers >= 0.2
2121 , conduit >= 0.5 && < 1.2
2222 , conduit-extra
warp/warp.cabal+1−1
@@ -1,5 +1,5 @@
11Name: warp
2−Version: 2.1.4.2
2+Version: 2.1.5
33Synopsis: A fast, light-weight web server for WAI applications.
44License: MIT
55License-file: LICENSE