network-conduit-tls 1.1.0.1 → 1.1.0.2

raw patch · 2 files changed

+17/−2 lines, 2 filesdep ~networkdep ~streaming-commonsPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: network, streaming-commons

API changes (from Hackage documentation)

Files

• Data/Conduit/Network/TLS.hs +16/−1
• network-conduit-tls.cabal +1/−1

@@ -43,7 +43,7 @@ import Data.Conduit.Network.TLS.Internal import Data.Conduit (yield, awaitForever, Producer, Consumer) import qualified Data.Conduit.List as CL-import Network.Socket (SockAddr (SockAddrInet))+import Network.Socket (SockAddr (SockAddrInet), sClose) import Network.Socket.ByteString (recv, sendAll) import Control.Exception (bracket) import Control.Monad.Trans.Class (lift)@@ -160,6 +160,9 @@                   , appWrite' = sendAll socket                   , appSockAddr' = addr                   , appLocalAddr' = mlocal+#if MIN_VERSION_streaming_commons(0,1,6)+                  , appCloseConnection' = sClose socket+#endif                   }                 -- wrap up the current connection with TLS                 startTls = \app' -> do@@ -192,6 +195,9 @@     , appWrite' = TLS.sendData ctx . L.fromChunks . return     , appSockAddr' = addr     , appLocalAddr' = mlocal+#if MIN_VERSION_streaming_commons(0,1,6)+    , appCloseConnection' = TLS.contextClose ctx+#endif     }  -- taken from stunnel example in tls-extra@@ -297,6 +303,9 @@             , appWrite' = NC.connectionPut conn             , appSockAddr' = SockAddrInet (fromIntegral tlsClientPort) 0 -- FIXME             , appLocalAddr' = Nothing+#if MIN_VERSION_streaming_commons(0,1,6)+            , appCloseConnection' = NC.connectionClose conn+#endif             })  @@ -324,6 +333,9 @@             , appWrite' = NC.connectionPut conn             , appSockAddr' = SockAddrInet (fromIntegral tlsClientPort) 0 -- FIXME             , appLocalAddr' = Nothing+#if MIN_VERSION_streaming_commons(0,1,6)+            , appCloseConnection' = NC.connectionClose conn+#endif             }             , \app' -> do                  NC.connectionSetSecure context conn tlsClientTLSSettings@@ -332,6 +344,9 @@                    , appWrite' = NC.connectionPut conn                    , appSockAddr' = SockAddrInet (fromIntegral tlsClientPort) 0 -- FIXME                    , appLocalAddr' = Nothing+#if MIN_VERSION_streaming_commons(0,1,6)+                   , appCloseConnection' = NC.connectionClose conn+#endif                    }             )             )

@@ -1,5 +1,5 @@ name:                network-conduit-tls-version:             1.1.0.1+version:             1.1.0.2 synopsis:            Create TLS-aware network code with conduits description:         Uses the tls package for a pure-Haskell implementation. homepage:            https://github.com/snoyberg/conduit