From 0563aacd5381fe08335ccb4bd3f3497f4cc528b9 Mon Sep 17 00:00:00 2001 From: Thomas Woolford Date: Thu, 1 Aug 2013 23:29:53 +0930 Subject: [PATCH] Keep up to date with changes in conduit HTTP lib. --- app/App.hs | 2 +- lib/Network/HTTP/LoadTest.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/App.hs b/app/App.hs index 9543c95..23bbafa 100644 --- a/app/App.hs +++ b/app/App.hs @@ -169,7 +169,7 @@ createRequest Args{..} = do check (Just "POST") = return "POST" check (Just "PUT") = return "PUT" check _ = fatal "only POST or PUT may have a body" - req = req0 { E.redirectCount = 0, E.checkStatus = \_ _ -> Nothing } + req = req0 { E.redirectCount = 0, E.checkStatus = \_ _ _ -> Nothing } case (from_file, literal) of (Nothing,Nothing) -> return req { E.method = maybe "GET" B.pack method } (Just f,Nothing) -> do diff --git a/lib/Network/HTTP/LoadTest.hs b/lib/Network/HTTP/LoadTest.hs index 72f876a..8175109 100644 --- a/lib/Network/HTTP/LoadTest.hs +++ b/lib/Network/HTTP/LoadTest.hs @@ -69,7 +69,7 @@ client Config{..} mgr interval = loop 0 [] issueRequest :: ResourceT IO (Response L.ByteString) issueRequest = httpLbs (clear $ fromReq request) mgr `catch` (throwIO . NetworkError) - where clear r = r { checkStatus = \_ _ -> Nothing + where clear r = r { checkStatus = \_ _ _ -> Nothing , responseTimeout = Nothing } timedRequest :: ResourceT IO Event