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

Fix reversion in support of annex.web-options

Browse source 
Inverted logic added as part of the url security fix made it always use
curl when annex.security.allowed-http-addresses=all unless annex.web-options
was set.

That nobody noticed kind of makes me wonder if anyone uses
annex.web-options..

This commit was sponsored by Denis Dzyubenko on Patreon.
This commit is contained in:
Joey Hess 2018-10-04 13:43:29 -04:00
parent bf9af05867
commit 4b793fb077
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 3 additions and 2 deletions

4
Annex/Url.hs
View file

@ -59,8 +59,8 @@ getUrlOptions = Annex.getState Annex.urloptions >>= \case
-- it from accessing specific IP addresses.
curlopts <- map Param . annexWebOptions <$> Annex.getGitConfig
let urldownloader = if null curlopts
then U.DownloadWithCurl curlopts
else U.DownloadWithConduit
then U.DownloadWithConduit
else U.DownloadWithCurl curlopts
manager <- liftIO $ U.newManager U.managerSettings
return (urldownloader, manager)
allowedaddrs -> do

1
CHANGELOG
View file

@ -4,6 +4,7 @@ git-annex (6.20180927) UNRELEASED; urgency=medium
tree because export tracking is not configured.
* Improve display when git config download from a http remote fails.
* Added annex.jobs setting, which is like using the -J option.
* Fix reversion in support of annex.web-options.
-- Joey Hess <id@joeyh.name> Thu, 27 Sep 2018 15:27:20 -0400