mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Drop support for building with old versions of dns and http-conduit.

Browse source
This commit is contained in:
Joey Hess 2017-03-10 15:49:14 -04:00
parent fc3925a1cd
commit ca49a84ba5
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
4 changed files with 4 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Utility/Url.hs
View file

@ -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,