http-conduit 2.0.0 → 2.0.0.1

raw patch · 2 files changed

+14/−3 lines, 2 files

Files

• Network/HTTP/Conduit.hs +13/−2
• http-conduit.cabal +1/−1

@@ -181,7 +181,10 @@     , HttpException (..)     ) where +import qualified Data.ByteString              as S import qualified Data.ByteString.Lazy         as L+import           Data.Conduit                 (ResumableSource, ($$+-))+import qualified Data.Conduit.List            as CL  import           Control.Applicative          ((<$>)) import           Control.Exception.Lifted     (bracket)@@ -199,8 +202,7 @@ import           Network.HTTP.Client          (parseUrl, urlEncodedBody, applyBasicAuth) import           Network.HTTP.Client.Internal (addProxy, alwaysDecompress,                                                browserDecompress)-import           Network.HTTP.Client.Internal (getRedirectedRequest,-                                               lbsResponse)+import           Network.HTTP.Client.Internal (getRedirectedRequest) import           Network.HTTP.Client.TLS      (mkManagerSettings,                                                tlsManagerSettings) import           Network.HTTP.Client.Internal (Cookie (..), CookieJar (..),@@ -267,3 +269,12 @@  setConnectionClose :: Request -> Request setConnectionClose req = req{requestHeaders = ("Connection", "close") : requestHeaders req}++lbsResponse :: Monad m+            => Response (ResumableSource m S.ByteString)+            -> m (Response L.ByteString)+lbsResponse res = do+    bss <- responseBody res $$+- CL.consume+    return res+        { responseBody = L.fromChunks bss+        }

@@ -1,5 +1,5 @@ name:            http-conduit-version:         2.0.0+version:         2.0.0.1 license:         BSD3 license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>