http-client-tls 0.2.1.2 → 0.2.2

raw patch · 2 files changed

+10/−7 lines, 2 filesdep ~connectiondep ~http-clientPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: connection, http-client

API changes (from Hackage documentation)

Files

• Network/HTTP/Client/TLS.hs +7/−4
• http-client-tls.cabal +3/−3

@@ -79,16 +79,19 @@ getTlsProxyConnection     :: NC.TLSSettings     -> Maybe NC.SockSettings-    -> IO (S.ByteString -> (Connection -> IO ()) -> Maybe HostAddress -> String -> Int -> IO Connection)+    -> IO (S.ByteString -> (Connection -> IO ()) -> String -> Maybe HostAddress -> String -> Int -> IO Connection) getTlsProxyConnection tls sock = do     context <- NC.initConnectionContext-    return $ \connstr checkConn _ha host port -> do+    return $ \connstr checkConn serverName _ha host port -> do         --error $ show (connstr, host, port)         conn <- NC.connectTo context NC.ConnectionParams-            { NC.connectionHostname = host+            { NC.connectionHostname = serverName             , NC.connectionPort = fromIntegral port             , NC.connectionUseSecure = Nothing-            , NC.connectionUseSocks = sock+            , NC.connectionUseSocks =+                case sock of+                    Just _ -> error "Cannot use SOCKS and TLS proxying together"+                    Nothing -> Just $ NC.OtherProxy host $ fromIntegral port             }          NC.connectionPut conn connstr

@@ -1,5 +1,5 @@ name:                http-client-tls-version:             0.2.1.2+version:             0.2.2 synopsis:            http-client backend using the connection package and tls library description:         Intended for use by higher-level libraries, such as http-conduit. homepage:            https://github.com/snoyberg/http-client@@ -16,8 +16,8 @@   other-extensions:    ScopedTypeVariables   build-depends:       base >= 4 && < 5                      , data-default-class-                     , http-client >= 0.2.2-                     , connection >= 0.2+                     , http-client >= 0.3.5+                     , connection >= 0.2.2                      , network                      , tls >=1.1                      , bytestring