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

move comment

Browse source
This commit is contained in:
Joey Hess 2021-03-24 13:57:00 -04:00
parent 97021435de
commit fdf1ccbe3f
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Annex/Url.hs
View file

@ -82,9 +82,6 @@ getUrlOptions = Annex.getState Annex.urloptions >>= \case
checkallowedaddr = words . annexAllowedIPAddresses <$> Annex.getGitConfig >>= \case checkallowedaddr = words . annexAllowedIPAddresses <$> Annex.getGitConfig >>= \case
["all"] -> do ["all"] -> do
-- Only allow curl when all are allowed,
-- as its interface does not allow preventing
-- it from accessing specific IP addresses.
curlopts <- map Param . annexWebOptions <$> Annex.getGitConfig curlopts <- map Param . annexWebOptions <$> Annex.getGitConfig
let urldownloader = if null curlopts let urldownloader = if null curlopts
then U.DownloadWithConduit $ then U.DownloadWithConduit $
@ -120,6 +117,8 @@ getUrlOptions = Annex.getState Annex.urloptions >>= \case
"http proxy settings not used due to annex.security.allowed-ip-addresses configuration" "http proxy settings not used due to annex.security.allowed-ip-addresses configuration"
manager <- liftIO $ U.newManager $ manager <- liftIO $ U.newManager $
avoidtimeout settings avoidtimeout settings
-- Curl is not used, as its interface does not allow
-- preventing it from accessing specific IP addresses.
let urldownloader = U.DownloadWithConduit $ let urldownloader = U.DownloadWithConduit $
U.DownloadWithCurlRestricted r U.DownloadWithCurlRestricted r
return (urldownloader, manager) return (urldownloader, manager)