commit ghc-http-conduit for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-http-conduit for openSUSE:Factory checked in at 2016-07-07 15:10:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-http-conduit (Old)
and /work/SRC/openSUSE:Factory/.ghc-http-conduit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-http-conduit"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-http-conduit/ghc-http-conduit.changes 2016-05-13 09:24:04.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-http-conduit.new/ghc-http-conduit.changes 2016-07-07 15:10:28.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Jul 4 09:24:59 UTC 2016 - mimi.vx@gmail.com
+
+- update to 2.1.11
+* Switch to non-throwing behavior in Network.HTTP.Simple
+
+-------------------------------------------------------------------
Old:
----
http-conduit-2.1.10.1.tar.gz
New:
----
http-conduit-2.1.11.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-http-conduit.spec ++++++
--- /var/tmp/diff_new_pack.t8FJmT/_old 2016-07-07 15:10:29.000000000 +0200
+++ /var/tmp/diff_new_pack.t8FJmT/_new 2016-07-07 15:10:29.000000000 +0200
@@ -21,7 +21,7 @@
%bcond_with tests
Name: ghc-http-conduit
-Version: 2.1.10.1
+Version: 2.1.11
Release: 0
Summary: HTTP client package with conduit interface and HTTPS support
License: BSD-2-Clause
++++++ http-conduit-2.1.10.1.tar.gz -> http-conduit-2.1.11.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-conduit-2.1.10.1/ChangeLog.md new/http-conduit-2.1.11/ChangeLog.md
--- old/http-conduit-2.1.10.1/ChangeLog.md 2016-05-05 15:49:06.000000000 +0200
+++ new/http-conduit-2.1.11/ChangeLog.md 2016-06-30 11:43:27.000000000 +0200
@@ -1,3 +1,7 @@
+## 2.1.11
+
+* Switch to non-throwing behavior in `Network.HTTP.Simple` [#193](https://github.com/snoyberg/http-client/issues/193)
+
## 2.1.10.1
* Fix mistaken `@since` comments
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-conduit-2.1.10.1/Network/HTTP/Conduit.hs new/http-conduit-2.1.11/Network/HTTP/Conduit.hs
--- old/http-conduit-2.1.10.1/Network/HTTP/Conduit.hs 2016-05-05 15:49:06.000000000 +0200
+++ new/http-conduit-2.1.11/Network/HTTP/Conduit.hs 2016-06-30 11:43:27.000000000 +0200
@@ -36,7 +36,7 @@
-- >
-- > main :: IO ()
-- > main = do
--- > request <- parseUrl "http://google.com/"
+-- > request <- parseRequest "http://google.com/"
-- > manager <- newManager tlsManagerSettings
-- > runResourceT $ do
-- > response <- http request manager
@@ -88,7 +88,7 @@
-- > }
-- >
-- > main = withSocketsDo $ do
--- > request' <- parseUrl "http://example.com/secret-page"
+-- > request' <- parseRequest "http://example.com/secret-page"
-- > manager <- newManager tlsManagerSettings
-- > let request = request' { cookieJar = Just $ createCookieJar [cookie] }
-- > (fmap Just (httpLbs request manager)) `E.catch`
@@ -121,7 +121,7 @@
-- >
-- > main :: IO ()
-- > main = withSocketsDo $ do
--- > request' <- parseUrl "http://www.yesodweb.com/does-not-exist"
+-- > request' <- parseRequest "http://www.yesodweb.com/does-not-exist"
-- > let request = request' { checkStatus = \_ _ _ -> Nothing }
-- > manager <- newManager tlsManagerSettings
-- > res <- httpLbs request manager
@@ -137,7 +137,7 @@
-- >
-- > main :: IO ()
-- > main = do
--- > request <- parseUrl "https://github.com/"
+-- > request <- parseRequest "https://github.com/"
-- > let settings = mkManagerSettings (TLSSettingsSimple True False False) Nothing
-- > manager <- newManager settings
-- > res <- httpLbs request manager
@@ -208,6 +208,10 @@
, destroyCookieJar
-- * Utility functions
, parseUrl
+ , parseUrlThrow
+ , parseRequest
+ , parseRequest_
+ , defaultRequest
, applyBasicAuth
, addProxy
, lbsResponse
@@ -243,7 +247,8 @@
closeManager, managerConnCount,
managerResponseTimeout,
managerTlsConnection, newManager)
-import Network.HTTP.Client (parseUrl, urlEncodedBody, applyBasicAuth)
+import Network.HTTP.Client (parseUrl, parseUrlThrow, urlEncodedBody, applyBasicAuth,
+ defaultRequest, parseRequest, parseRequest_)
import Network.HTTP.Client.Internal (addProxy, alwaysDecompress,
browserDecompress)
import Network.HTTP.Client.Internal (getRedirectedRequest)
@@ -284,7 +289,7 @@
--
-- This function will 'throwIO' an 'HttpException' for any
-- response with a non-2xx status code (besides 3xx redirects up
--- to a limit of 10 redirects). It uses 'parseUrl' to parse the
+-- to a limit of 10 redirects). It uses 'parseUrlThrow' to parse the
-- input. This function essentially wraps 'httpLbs'.
--
-- Note: Even though this function returns a lazy bytestring, it
@@ -297,7 +302,7 @@
simpleHttp :: MonadIO m => String -> m L.ByteString
simpleHttp url = liftIO $ do
man <- newManager tlsManagerSettings
- req <- liftIO $ parseUrl url
+ req <- liftIO $ parseUrlThrow url
responseBody <$> httpLbs (setConnectionClose req) man
conduitManagerSettings :: ManagerSettings
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-conduit-2.1.10.1/Network/HTTP/Simple.hs new/http-conduit-2.1.11/Network/HTTP/Simple.hs
--- old/http-conduit-2.1.10.1/Network/HTTP/Simple.hs 2016-05-05 15:49:06.000000000 +0200
+++ new/http-conduit-2.1.11/Network/HTTP/Simple.hs 2016-06-30 11:43:27.000000000 +0200
@@ -30,8 +30,9 @@
, H.HttpException (..)
, H.Proxy (..)
-- * Request constructions
- , defaultRequest
- , parseRequest
+ , H.defaultRequest
+ , H.parseRequest
+ , H.parseRequest_
-- * Request lenses
-- ** Basics
, setRequestMethod
@@ -135,30 +136,6 @@
deriving (Show, Typeable)
instance Exception JSONException
--- | The default request value. You'll almost certainly want to set the
--- 'requestHost', and likely the 'requestPath' as well.
---
--- See also 'parseRequest'
---
--- @since 2.1.10
-defaultRequest :: H.Request
-defaultRequest = def
-
--- | Parse a 'H.Request' from a 'String'. This is given as a URL, with an
--- optional leading request method, e.g.:
---
--- * @http://example.com@
--- * @https://example.com:1234/foo/bar?baz=bin@
--- * @PUT http://example.com/some-resource@
---
--- If parsing fails, 'Catch.throwM' will be called. The behavior of this
--- function is also used for the @IsString@ instance for use with
--- @OverloadedStrings@.
---
--- @since 2.1.10
-parseRequest :: Catch.MonadThrow m => String -> m H.Request
-parseRequest = H.parseUrl
-
-- | Perform an HTTP request and consume the body with the given 'C.Sink'
--
-- @since 2.1.10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-conduit-2.1.10.1/http-conduit.cabal new/http-conduit-2.1.11/http-conduit.cabal
--- old/http-conduit-2.1.10.1/http-conduit.cabal 2016-05-05 15:49:06.000000000 +0200
+++ new/http-conduit-2.1.11/http-conduit.cabal 2016-06-30 11:43:27.000000000 +0200
@@ -1,5 +1,5 @@
name: http-conduit
-version: 2.1.10.1
+version: 2.1.11
license: BSD3
license-file: LICENSE
author: Michael Snoyman
participants (1)
-
root@hilbert.suse.de