http-client 0.5.6 → 0.5.6.1

raw patch · 3 files changed

+10/−5 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• ChangeLog.md +6/−0
• Network/HTTP/Client/Manager.hs +3/−4
• http-client.cabal +1/−1

@@ -1,3 +1,9 @@+## 0.5.6.1++* Revert socks5 and socks5h support from+  [#262](https://github.com/snoyberg/http-client/pull/262); the support was+  untested and did not work as intended.+ ## 0.5.6  * Added socks5 and socks5h support [#262](https://github.com/snoyberg/http-client/pull/262)

@@ -507,13 +507,12 @@         Just str -> do             let invalid = throwHttp $ InvalidProxyEnvironmentVariable name (T.pack str)             (p, muserpass) <- maybe invalid return $ do+                let allowedScheme x = x == "http:"                 uri <- case U.parseURI str of-                    Just u | U.uriScheme u == "http:" -> return u-                           | U.uriScheme u == "socks5:" -> return u-                           | U.uriScheme u == "socks5h:" -> return u+                    Just u | allowedScheme (U.uriScheme u) -> return u                     _ -> U.parseURI $ "http://" ++ str -                guard $ U.uriScheme uri == "http:"+                guard $ allowedScheme $ U.uriScheme uri                 guard $ null (U.uriPath uri) || U.uriPath uri == "/"                 guard $ null $ U.uriQuery uri                 guard $ null $ U.uriFragment uri

@@ -1,5 +1,5 @@ name:                http-client-version:             0.5.6+version:             0.5.6.1 synopsis:            An HTTP client engine description:         Hackage documentation generation is not reliable. For up to date documentation, please see: <http://www.stackage.org/package/http-client>. homepage:            https://github.com/snoyberg/http-client