summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichaelSnoyman <>2019-10-10 04:03:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2019-10-10 04:03:00 (GMT)
commitae22d1fa9a3792feeca30be09cff86a19bc6db02 (patch)
treec8db5ac1d605848cec78bd458e80e1b7ab17c5dc
parent76b44e5a3f5991d325478d9c0d165fb3f64e42e2 (diff)
version 2.3.7.3HEAD2.3.7.3master
-rw-r--r--ChangeLog.md4
-rw-r--r--http-conduit.cabal14
-rw-r--r--test/main.hs4
3 files changed, 8 insertions, 14 deletions
diff --git a/ChangeLog.md b/ChangeLog.md
index 14b729d..109bf05 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,5 +1,9 @@
# ChangeLog for http-conduit
+## 2.3.7.3
+
+* Relax test suite version bounds
+
## 2.3.7.2
* Add the `network3` flag
diff --git a/http-conduit.cabal b/http-conduit.cabal
index a248014..179ccbd 100644
--- a/http-conduit.cabal
+++ b/http-conduit.cabal
@@ -1,5 +1,5 @@
name: http-conduit
-version: 2.3.7.2
+version: 2.3.7.3
license: BSD3
license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com>
@@ -66,7 +66,7 @@ test-suite test
, case-insensitive
, unliftio
, wai >= 3.0 && < 3.3
- , warp >= 3.0.0.2 && < 3.3
+ , warp >= 3.0.0.2 && < 3.4
, wai-conduit
, http-types
, cookie
@@ -77,15 +77,7 @@ test-suite test
, aeson
, temporary
, resourcet
- if flag(network3)
- build-depends: network >= 3, network-bsd
- else
- build-depends: network < 3
-
-flag network3
- default: False
- manual: False
- description: Use network 3 or higher
+ , network
source-repository head
type: git
diff --git a/test/main.hs b/test/main.hs
index c23ade8..4ccf844 100644
--- a/test/main.hs
+++ b/test/main.hs
@@ -21,7 +21,6 @@ import UnliftIO.Exception (try, SomeException, bracket, onException, IOException
import qualified Data.IORef as I
import qualified Control.Exception as E (catch)
import qualified Network.Socket as NS
-import qualified Network.BSD
import CookieTest (cookieTest)
#if MIN_VERSION_conduit(1,1,0)
import Data.Conduit.Network (runTCPServer, serverSettings, appSink, appSource, ServerSettings)
@@ -406,9 +405,8 @@ main = do
describe "hostAddress" $ do
it "overrides host" $ withApp app $ \port -> do
- entry <- Network.BSD.getHostByName "127.0.0.1"
req' <- parseUrlThrow $ "http://example.com:" ++ show port
- let req = req' { hostAddress = Just $ Network.BSD.hostAddress entry }
+ let req = req' { hostAddress = Just 0x0100007f } -- 127.0.0.1
manager <- newManager tlsManagerSettings
res <- httpLbs req manager
responseBody res @?= "homepage for example.com"