Hello community, here is the log from the commit of package ghc-http-conduit for openSUSE:Factory checked in at 2015-08-05 06:51:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-07-12 22:52:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-http-conduit.new/ghc-http-conduit.changes 2015-08-05 06:52:01.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Aug 4 06:00:31 UTC 2015 - [email protected] + +- update to 2.1.7.2 + +------------------------------------------------------------------- +Mon Jul 27 07:42:49 UTC 2015 - [email protected] + +- update to 2.1.7.1 +* Deprecate conduitManagerSettings, re-export tlsManagerSettings +* Deprecate withManager and withManagerSettings + + +------------------------------------------------------------------- Old: ---- http-conduit-2.1.5.1.tar.gz New: ---- http-conduit-2.1.7.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-http-conduit.spec ++++++ --- /var/tmp/diff_new_pack.r8TLTh/_old 2015-08-05 06:52:01.000000000 +0200 +++ /var/tmp/diff_new_pack.r8TLTh/_new 2015-08-05 06:52:01.000000000 +0200 @@ -21,7 +21,7 @@ %bcond_with tests Name: ghc-http-conduit -Version: 2.1.5.1 +Version: 2.1.7.2 Release: 0 Summary: HTTP client package with conduit interface and HTTPS support License: BSD-2-Clause ++++++ http-conduit-2.1.5.1.tar.gz -> http-conduit-2.1.7.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-conduit-2.1.5.1/ChangeLog.md new/http-conduit-2.1.7.2/ChangeLog.md --- old/http-conduit-2.1.5.1/ChangeLog.md 1970-01-01 01:00:00.000000000 +0100 +++ new/http-conduit-2.1.7.2/ChangeLog.md 2015-07-30 16:55:19.000000000 +0200 @@ -0,0 +1,7 @@ +## 2.1.7 + +* Deprecate `conduitManagerSettings`, re-export `tlsManagerSettings` [#136](https://github.com/snoyberg/http-client/issues/136) [#137](https://github.com/snoyberg/http-client/issues/137) + +## 2.1.6 + +* Deprecate `withManager` and `withManagerSettings` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-conduit-2.1.5.1/Network/HTTP/Conduit.hs new/http-conduit-2.1.7.2/Network/HTTP/Conduit.hs --- old/http-conduit-2.1.5.1/Network/HTTP/Conduit.hs 2015-07-02 17:35:06.000000000 +0200 +++ new/http-conduit-2.1.7.2/Network/HTTP/Conduit.hs 2015-07-30 16:55:19.000000000 +0200 @@ -19,11 +19,13 @@ -- > import Data.Conduit.Binary (sinkFile) -- Exported from the package conduit-extra -- > import Network.HTTP.Conduit -- > import qualified Data.Conduit as C +-- > import Control.Monad.Trans.Resource (runResourceT) -- > -- > main :: IO () -- > main = do -- > request <- parseUrl "http://google.com/"; --- > withManager $ \manager -> do +-- > manager <- newManager tlsManagerSettings +-- > runResourceT $ do -- > response <- http request manager -- > responseBody response C.$$+- sinkFile "google.html" -- @@ -74,8 +76,9 @@ -- > -- > main = withSocketsDo $ do -- > request' <- parseUrl "http://example.com/secret-page"; +-- > manager <- newManager tlsManagerSettings -- > let request = request' { cookieJar = Just $ createCookieJar [cookie] } --- > (fmap Just (withManager $ httpLbs request)) `E.catch` +-- > (fmap Just (httpLbs request manager)) `E.catch` -- > (\(StatusCodeException s _ _) -> -- > if statusCode s==403 then (putStrLn "login failed" >> return Nothing) else return Nothing) -- @@ -107,7 +110,8 @@ -- > main = withSocketsDo $ do -- > request' <- parseUrl "http://www.yesodweb.com/does-not-exist"; -- > let request = request' { checkStatus = \_ _ _ -> Nothing } --- > res <- withManager $ httpLbs request +-- > manager <- newManager tlsManagerSettings +-- > res <- httpLbs request manager -- > print res -- -- By default, when connecting to websites using HTTPS, functions in this @@ -122,7 +126,8 @@ -- > main = do -- > request <- parseUrl "https://github.com/"; -- > let settings = mkManagerSettings (TLSSettingsSimple True False False) Nothing --- > res <- withManagerSettings settings $ httpLbs request +-- > manager <- newManager settings +-- > res <- httpLbs request manager -- > print res -- -- For more information, please be sure to read the documentation in the @@ -178,6 +183,7 @@ -- ** Settings , ManagerSettings , conduitManagerSettings + , tlsManagerSettings , mkManagerSettings , managerConnCount , managerResponseTimeout @@ -197,7 +203,7 @@ , alwaysDecompress , browserDecompress -- * Request bodies - -- | "Network.HTTP.Conduit.MultipartFormData" provides an API for building + -- | "Network.HTTP.Client.MultipartFormData" provides an API for building -- form-data request bodies. , urlEncodedBody -- * Exceptions @@ -276,26 +282,27 @@ -- Note: This function creates a new 'Manager'. It should be avoided -- in production code. simpleHttp :: MonadIO m => String -> m L.ByteString -simpleHttp url = liftIO $ withManager $ \man -> do +simpleHttp url = liftIO $ do + man <- newManager tlsManagerSettings req <- liftIO $ parseUrl url responseBody <$> httpLbs (setConnectionClose req) man conduitManagerSettings :: ManagerSettings conduitManagerSettings = tlsManagerSettings +{-# DEPRECATED conduitManagerSettings "Use tlsManagerSettings" #-} withManager :: (MonadIO m, MonadBaseControl IO m) => (Manager -> ResourceT m a) -> m a -withManager = withManagerSettings conduitManagerSettings +withManager = withManagerSettings tlsManagerSettings +{-# DEPRECATED withManager "Please use newManager tlsManagerSettings" #-} withManagerSettings :: (MonadIO m, MonadBaseControl IO m) => ManagerSettings -> (Manager -> ResourceT m a) -> m a -withManagerSettings set f = bracket - (liftIO $ newManager set) - (liftIO . closeManager) - (runResourceT . f) +withManagerSettings set f = liftIO (newManager set) >>= runResourceT . f +{-# DEPRECATED withManagerSettings "Please use newManager" #-} setConnectionClose :: Request -> Request setConnectionClose req = req{requestHeaders = ("Connection", "close") : requestHeaders req} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-conduit-2.1.5.1/README.md new/http-conduit-2.1.7.2/README.md --- old/http-conduit-2.1.5.1/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/http-conduit-2.1.7.2/README.md 2015-07-30 16:55:19.000000000 +0200 @@ -0,0 +1 @@ +Make HTTP requests using the conduit library for a streaming interface. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-conduit-2.1.5.1/http-conduit.cabal new/http-conduit-2.1.7.2/http-conduit.cabal --- old/http-conduit-2.1.5.1/http-conduit.cabal 2015-07-02 17:35:06.000000000 +0200 +++ new/http-conduit-2.1.7.2/http-conduit.cabal 2015-07-30 16:55:19.000000000 +0200 @@ -1,5 +1,5 @@ name: http-conduit -version: 2.1.5.1 +version: 2.1.7.2 license: BSD3 license-file: LICENSE author: Michael Snoyman <[email protected]> @@ -20,6 +20,8 @@ , nyan.gif , certificate.pem , key.pem + , README.md + , ChangeLog.md library build-depends: base >= 4 && < 5 @@ -61,7 +63,7 @@ , lifted-base , network , wai >= 3.0 && < 3.1 - , warp >= 3.0.0.2 && < 3.1 + , warp >= 3.0.0.2 && < 3.2 , wai-conduit , http-types , cookie diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/http-conduit-2.1.5.1/test/main.hs new/http-conduit-2.1.7.2/test/main.hs --- old/http-conduit-2.1.5.1/test/main.hs 2015-07-02 17:35:06.000000000 +0200 +++ new/http-conduit-2.1.7.2/test/main.hs 2015-07-30 16:55:19.000000000 +0200 @@ -9,7 +9,7 @@ import Network.Wai hiding (requestBody) import Network.Wai.Conduit (responseSource, sourceRequestBody) import qualified Network.Wai as Wai -import Network.Wai.Handler.Warp (runSettings, defaultSettings, settingsPort, settingsBeforeMainLoop, Settings, setTimeout) +import Network.Wai.Handler.Warp (runSettings, defaultSettings, setPort, setBeforeMainLoop, Settings, setTimeout) import Network.HTTP.Conduit hiding (port) import qualified Network.HTTP.Conduit as NHC import Network.HTTP.Client.MultipartFormData @@ -127,10 +127,10 @@ port <- getPort baton <- newEmptyMVar bracket - (forkIO $ runSettings (modSettings defaultSettings - { settingsPort = port - , settingsBeforeMainLoop = putMVar baton () - }) (app'' port) `onException` putMVar baton ()) + (forkIO $ runSettings (modSettings $ + setPort port + $ setBeforeMainLoop (putMVar baton ()) + defaultSettings) (app'' port) `onException` putMVar baton ()) killThread (const $ takeMVar baton >> f port) where @@ -146,10 +146,11 @@ port <- getPort baton <- newEmptyMVar bracket - (forkIO $ WT.runTLS WT.defaultTlsSettings defaultSettings - { settingsPort = port - , settingsBeforeMainLoop = putMVar baton () - } (app'' port) `onException` putMVar baton ()) + (forkIO $ WT.runTLS WT.defaultTlsSettings ( + setPort port + $ setBeforeMainLoop (putMVar baton ()) + defaultSettings) + (app'' port) `onException` putMVar baton ()) killThread (const $ takeMVar baton >> f port) where
