summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichaelSnoyman <>2015-07-23 13:33:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2015-07-23 13:33:00 (GMT)
commitf3d37bcdf6ed312fc34bed0edee35e1e91edadad (patch)
tree93da91c9aaebc19d9dc574f5b4718ca57b174bc5
parent6e332b00ad5a76aa49d695e2bd81c201a3c6ff42 (diff)
version 2.1.7.12.1.7.1
-rw-r--r--http-conduit.cabal4
-rw-r--r--test/main.hs19
2 files changed, 12 insertions, 11 deletions
diff --git a/http-conduit.cabal b/http-conduit.cabal
index 6d5245c..7f9bf77 100644
--- a/http-conduit.cabal
+++ b/http-conduit.cabal
@@ -1,5 +1,5 @@
name: http-conduit
-version: 2.1.7
+version: 2.1.7.1
license: BSD3
license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com>
@@ -63,7 +63,7 @@ test-suite test
, 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 --git a/test/main.hs b/test/main.hs
index c9b98af..eb7e0ac 100644
--- a/test/main.hs
+++ b/test/main.hs
@@ -9,7 +9,7 @@ import Test.HUnit
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 @@ withAppSettings modSettings app' f = do
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 @@ withAppTls' app' f = do
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