summaryrefslogtreecommitdiff
path: root/Utility
diff options
context:
space:
mode:
Diffstat (limited to 'Utility')
-rw-r--r--Utility/SRV.hs9
-rw-r--r--Utility/Url.hs8
2 files changed, 1 insertions, 16 deletions
diff --git a/Utility/SRV.hs b/Utility/SRV.hs
index 033064a27..64cca6060 100644
--- a/Utility/SRV.hs
+++ b/Utility/SRV.hs
@@ -5,8 +5,6 @@
- License: BSD-2-clause
-}
-{-# LANGUAGE CPP #-}
-
module Utility.SRV (
mkSRVTcp,
mkSRV,
@@ -42,12 +40,7 @@ lookupSRV :: SRV -> IO [HostPort]
lookupSRV (SRV srv) = do
seed <- makeResolvSeed defaultResolvConf
r <- withResolver seed $ flip DNS.lookupSRV $ B8.fromString srv
- return $
-#if MIN_VERSION_dns(1,0,0)
- either (const []) use r
-#else
- maybe [] use r
-#endif
+ return $ either (const []) use r
where
use = orderHosts . map tohosts
tohosts (priority, weight, port, hostname) =
diff --git a/Utility/Url.hs b/Utility/Url.hs
index 1b68dce7f..2b71b6be4 100644
--- a/Utility/Url.hs
+++ b/Utility/Url.hs
@@ -67,11 +67,7 @@ data UrlOptions = UrlOptions
{ userAgent :: Maybe UserAgent
, reqHeaders :: Headers
, reqParams :: [CommandParam]
-#if MIN_VERSION_http_conduit(2,0,0)
, applyRequest :: Request -> Request
-#else
- , applyRequest :: forall m. Request m -> Request m
-#endif
}
instance Default UrlOptions
@@ -232,11 +228,7 @@ contentDispositionFilename s
drop 1 $ dropWhile (/= '"') s
| otherwise = Nothing
-#if MIN_VERSION_http_conduit(2,0,0)
headRequest :: Request -> Request
-#else
-headRequest :: Request m -> Request m
-#endif
headRequest r = r
{ method = methodHead
-- remove defaut Accept-Encoding header, to get actual,