Hello community,
here is the log from the commit of package ghc-http-conduit for
openSUSE:Factory checked in at 2019-03-19 09:59:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-http-conduit (Old)
and /work/SRC/openSUSE:Factory/.ghc-http-conduit.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-http-conduit"
Tue Mar 19 09:59:42 2019 rev:18 rq:686009 version:2.3.6.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-http-conduit/ghc-http-conduit.changes
2019-02-17 12:20:12.216219323 +0100
+++
/work/SRC/openSUSE:Factory/.ghc-http-conduit.new.28833/ghc-http-conduit.changes
2019-03-19 09:59:43.392031661 +0100
@@ -1,0 +2,18 @@
+Wed Mar 13 11:03:16 UTC 2019 - [email protected]
+
+- Update http-conduit to version 2.3.6.1.
+ # ChangeLog for http-conduit
+
+ ## 2.3.6.1
+
+ * Add back compatibility with older http-client version
[#393](https://github.com/snoyberg/http-client/pull/393)
+
+-------------------------------------------------------------------
+Tue Mar 12 03:02:38 UTC 2019 - [email protected]
+
+- Update http-conduit to version 2.3.6.
+ ## 2.3.6
+
+ * Add `httpSource` to `Network.HTTP.Client.Conduit`
[#390](https://github.com/snoyberg/http-client/pull/390).
+
+-------------------------------------------------------------------
Old:
----
http-conduit-2.3.5.tar.gz
http-conduit.cabal
New:
----
http-conduit-2.3.6.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-http-conduit.spec ++++++
--- /var/tmp/diff_new_pack.NIfsce/_old 2019-03-19 09:59:44.024028706 +0100
+++ /var/tmp/diff_new_pack.NIfsce/_new 2019-03-19 09:59:44.028028688 +0100
@@ -19,14 +19,13 @@
%global pkg_name http-conduit
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 2.3.5
+Version: 2.3.6.1
Release: 0
Summary: HTTP client package with conduit interface and HTTPS support
License: BSD-2-Clause
Group: Development/Libraries/Haskell
URL: https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
-Source1:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-aeson-devel
BuildRequires: ghc-bytestring-devel
@@ -78,7 +77,6 @@
%prep
%setup -q -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
%build
%ghc_lib_build
++++++ http-conduit-2.3.5.tar.gz -> http-conduit-2.3.6.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/http-conduit-2.3.5/ChangeLog.md
new/http-conduit-2.3.6.1/ChangeLog.md
--- old/http-conduit-2.3.5/ChangeLog.md 2019-01-28 18:33:22.000000000 +0100
+++ new/http-conduit-2.3.6.1/ChangeLog.md 2019-03-12 08:48:50.000000000
+0100
@@ -1,3 +1,13 @@
+# ChangeLog for http-conduit
+
+## 2.3.6.1
+
+* Add back compatibility with older http-client version
[#393](https://github.com/snoyberg/http-client/pull/393)
+
+## 2.3.6
+
+* Add `httpSource` to `Network.HTTP.Client.Conduit`
[#390](https://github.com/snoyberg/http-client/pull/390).
+
## 2.3.5
* Adds `addToRequestQueryString` helper function
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/http-conduit-2.3.5/Network/HTTP/Client/Conduit.hs
new/http-conduit-2.3.6.1/Network/HTTP/Client/Conduit.hs
--- old/http-conduit-2.3.5/Network/HTTP/Client/Conduit.hs 2018-04-09
15:40:11.000000000 +0200
+++ new/http-conduit-2.3.6.1/Network/HTTP/Client/Conduit.hs 2019-03-11
11:24:39.000000000 +0100
@@ -15,6 +15,7 @@
, responseOpen
, responseClose
, acquireResponse
+ , httpSource
-- * Manager helpers
, defaultManagerSettings
, newManager
@@ -31,13 +32,14 @@
import Control.Monad (unless)
import Control.Monad.IO.Unlift (MonadIO, liftIO, MonadUnliftIO,
withRunInIO)
-import Control.Monad.Reader (MonadReader (..))
+import Control.Monad.Reader (MonadReader (..), runReaderT)
+import Control.Monad.Trans.Resource (MonadResource)
import Data.Acquire (Acquire, mkAcquire, with)
import Data.ByteString (ByteString)
import qualified Data.ByteString as S
import qualified Data.ByteString.Lazy as L
-import Data.Conduit (ConduitM, ($$+),
- await, yield, ($$++))
+import Data.Conduit (ConduitM, ($$+), ($$++),
+ await, yield, bracketP)
import Data.Int (Int64)
import Data.IORef (newIORef, readIORef, writeIORef)
import Network.HTTP.Client hiding (closeManager,
@@ -172,3 +174,19 @@
env <- ask
let man = getHttpManager env
liftIO $ H.httpNoBody req man
+
+-- | Same as 'Network.HTTP.Simple.httpSource', but uses 'Manager'
+-- from Reader environment instead of the global one.
+--
+-- Since 2.3.6
+httpSource
+ :: (MonadResource m, MonadIO n, MonadReader env m, HasHttpManager env)
+ => Request
+ -> (Response (ConduitM () ByteString n ()) -> ConduitM () r m ())
+ -> ConduitM () r m ()
+httpSource request withRes = do
+ env <- ask
+ bracketP
+ (runReaderT (responseOpen request) env)
+ responseClose
+ withRes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/http-conduit-2.3.5/Network/HTTP/Conduit.hs
new/http-conduit-2.3.6.1/Network/HTTP/Conduit.hs
--- old/http-conduit-2.3.5/Network/HTTP/Conduit.hs 2018-04-09
15:40:11.000000000 +0200
+++ new/http-conduit-2.3.6.1/Network/HTTP/Conduit.hs 2019-03-12
08:48:10.000000000 +0100
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE OverloadedStrings #-}
-- |
@@ -158,6 +159,9 @@
, rawBody
, decompress
, redirectCount
+#if MIN_VERSION_http_client(0,6,2)
+ , shouldStripHeaderOnRedirect
+#endif
, checkResponse
, responseTimeout
, cookieJar
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/http-conduit-2.3.5/Network/HTTP/Simple.hs
new/http-conduit-2.3.6.1/Network/HTTP/Simple.hs
--- old/http-conduit-2.3.5/Network/HTTP/Simple.hs 2019-01-28
18:33:22.000000000 +0100
+++ new/http-conduit-2.3.6.1/Network/HTTP/Simple.hs 2019-02-27
11:43:18.000000000 +0100
@@ -95,6 +95,7 @@
import qualified Data.Aeson as A
import qualified Data.Traversable as T
import Control.Exception (throw, throwIO, Exception)
+import Data.Monoid
import Data.Typeable (Typeable)
import qualified Data.Conduit as C
import Data.Conduit (runConduit, (.|), ConduitM)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/http-conduit-2.3.5/http-conduit.cabal
new/http-conduit-2.3.6.1/http-conduit.cabal
--- old/http-conduit-2.3.5/http-conduit.cabal 2019-01-28 18:33:22.000000000
+0100
+++ new/http-conduit-2.3.6.1/http-conduit.cabal 2019-03-12 08:48:27.000000000
+0100
@@ -1,5 +1,5 @@
name: http-conduit
-version: 2.3.5
+version: 2.3.6.1
license: BSD3
license-file: LICENSE
author: Michael Snoyman <[email protected]>
