http-conduit 1.4.0.2 → 1.4.1

raw patch · 3 files changed

+7/−25 lines, 3 filesdep ~conduitPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: conduit

API changes (from Hackage documentation)

Files

• Network/HTTP/Conduit.hs +1/−1
• Network/HTTP/Conduit/Response.hs +4/−22
• http-conduit.cabal +2/−2

@@ -173,7 +173,7 @@     case checkStatus req0 status hs of         Nothing -> return res         Just exc -> do-            CI.pipeClose body+            CI.runFinalize $ CI.pipeClose body             liftIO $ throwIO exc   where     go 0 _ _ = liftIO $ throwIO TooManyRedirects

@@ -23,10 +23,12 @@ import qualified Data.CaseInsensitive as CI  import Control.Monad.Trans.Resource (MonadResource)+import Control.Monad.Trans.Class (lift) import qualified Data.Conduit as C import qualified Data.Conduit.Zlib as CZ import qualified Data.Conduit.Binary as CB import qualified Data.Conduit.List as CL+import qualified Data.Conduit.Internal  import qualified Network.HTTP.Types as W @@ -118,7 +120,7 @@ checkHeaderLength len C.NeedInput{}     | len <= 0 =         let x = liftIO $ throwIO OverlongHeaders-         in C.PipeM x x+         in C.PipeM x (lift x) checkHeaderLength len (C.NeedInput pushI closeI) = C.NeedInput     (\bs -> checkHeaderLength         (len - S8.length bs)@@ -161,26 +163,6 @@                         if needsGunzip req hs'                             then src3 C.$= CZ.ungzip                             else src3-                return $ addCleanup cleanup src4+                return $ Data.Conduit.Internal.addCleanup cleanup src4      return $ Response s version hs' body---- | Add some cleanup code to the given 'C.Source'. General purpose--- function, could be included in conduit itself.-addCleanup :: Monad m-           => (Bool -> m ())-           -> C.Source m a-           -> C.Source m a-addCleanup cleanup (C.Done leftover ()) = C.PipeM-    (cleanup True >> return (C.Done leftover ()))-    (cleanup True)-addCleanup cleanup (C.HaveOutput src close x) = C.HaveOutput-    (addCleanup cleanup src)-    (cleanup False >> close)-    x-addCleanup cleanup (C.PipeM msrc close) = C.PipeM-    (liftM (addCleanup cleanup) msrc)-    (cleanup False >> close)-addCleanup cleanup (C.NeedInput p c) = C.NeedInput-    (addCleanup cleanup . p)-    (addCleanup cleanup c)

@@ -1,5 +1,5 @@ name:            http-conduit-version:         1.4.0.2+version:         1.4.1 license:         BSD3 license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>@@ -23,7 +23,7 @@                  , transformers          >= 0.2     && < 0.4                  , failure               >= 0.1                  , resourcet             >= 0.3     && < 0.4-                 , conduit               >= 0.4     && < 0.5+                 , conduit               >= 0.4.1   && < 0.5                  , zlib-conduit          >= 0.4     && < 0.5                  , blaze-builder-conduit >= 0.4     && < 0.5                  , attoparsec-conduit    >= 0.4     && < 0.5