summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichaelSnoyman <>2019-03-12 07:49:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2019-03-12 07:49:00 (GMT)
commit60036bd4dd1172124a8c75317382b32a7b42f0cc (patch)
tree312409cc0af4c703ae1a16ed8bf413dc8a0bfec5
parentf7c9af2639e976e2db01590e678e926afee7c108 (diff)
version 2.3.6.12.3.6.1
-rw-r--r--ChangeLog.md6
-rw-r--r--Network/HTTP/Conduit.hs3
-rw-r--r--http-conduit.cabal2
3 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog.md b/ChangeLog.md
index dd43e69..210fe86 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,9 @@
+# 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).
diff --git a/Network/HTTP/Conduit.hs b/Network/HTTP/Conduit.hs
index e58b50e..5f0dc07 100644
--- a/Network/HTTP/Conduit.hs
+++ b/Network/HTTP/Conduit.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE OverloadedStrings #-}
-- |
@@ -158,7 +159,9 @@ module Network.HTTP.Conduit
, rawBody
, decompress
, redirectCount
+#if MIN_VERSION_http_client(0,6,2)
, shouldStripHeaderOnRedirect
+#endif
, checkResponse
, responseTimeout
, cookieJar
diff --git a/http-conduit.cabal b/http-conduit.cabal
index 5c57c33..642ea30 100644
--- a/http-conduit.cabal
+++ b/http-conduit.cabal
@@ -1,5 +1,5 @@
name: http-conduit
-version: 2.3.6
+version: 2.3.6.1
license: BSD3
license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com>