Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent download on windows picking up rogue curl executable #32412

Merged
merged 3 commits into from
Jun 28, 2019
Merged

Prevent download on windows picking up rogue curl executable #32412

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
014e9e1
Test download function picking up rouge curl
musm Jun 25, 2019
2065043
debug statement to see which curl gets picked up
musm Jun 26, 2019
15a64f8
Drop debug statement
musm Jun 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion base/download.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function find_curl()
"/usr/bin/curl"
elseif Sys.iswindows() && Sys.isexecutable(joinpath(get(ENV, "SYSTEMROOT", "C:\\Windows"), "System32\\curl.exe"))
joinpath(get(ENV, "SYSTEMROOT", "C:\\Windows"), "System32\\curl.exe")
elseif Sys.which("curl") !== nothing
elseif !Sys.iswindows() && Sys.which("curl") !== nothing
"curl"
else
nothing
Expand Down