From d8dba40ba5431182ab6acdcadc619d8c4fa8206a Mon Sep 17 00:00:00 2001 From: Sam Truzjan Date: Wed, 26 Feb 2014 12:05:42 +0400 Subject: Bump http-conduit dependency --- src/Network/BitTorrent/Tracker/RPC/HTTP.hs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/Network/BitTorrent/Tracker/RPC/HTTP.hs b/src/Network/BitTorrent/Tracker/RPC/HTTP.hs index 32a5e79c..c5bf4e31 100644 --- a/src/Network/BitTorrent/Tracker/RPC/HTTP.hs +++ b/src/Network/BitTorrent/Tracker/RPC/HTTP.hs @@ -43,8 +43,9 @@ import Data.Typeable import Network.URI import Network.HTTP.Conduit hiding (Manager, newManager, closeManager, withManager) +import Network.HTTP.Client (defaultManagerSettings) +import Network.HTTP.Client.Internal (setUri) import qualified Network.HTTP.Conduit as HTTP -import Network.HTTP.Conduit.Internal (setUri) import Network.HTTP.Types.Header (hUserAgent) import Network.HTTP.Types.URI (SimpleQuery, renderSimpleQuery) @@ -92,7 +93,7 @@ instance Default Options where { optAnnounceExt = def , optHttpProxy = Nothing , optUserAgent = BC.pack libUserAgent - , optHttpOptions = def + , optHttpOptions = defaultManagerSettings } -- | HTTP tracker manager. @@ -114,7 +115,7 @@ withManager opts = bracket (newManager opts) closeManager -- Queries -----------------------------------------------------------------------} -fillRequest :: Options -> SimpleQuery -> Request m -> Request m +fillRequest :: Options -> SimpleQuery -> Request -> Request fillRequest Options {..} q r = r { queryString = joinQuery (queryString r) (renderSimpleQuery False q) , requestHeaders = (hUserAgent, optUserAgent) : requestHeaders r -- cgit v1.2.3