Skip to content

G
git2
Commit b0c3fa36 by Edward Thomson Committed by GitHub
Options

Merge pull request #4112 from cbargren/fix/proxy-env-vars 

Add support for lowercase proxy environment variables
parents 683ff4f3 61189a11
Showing with 6 additions and 2 deletions
src/remote.c
...@@ -770,8 +770,12 @@ int git_remote__get_http_proxy(git_remote *remote, bool use_ssl, char **proxy_ur ...@@ -770,8 +770,12 @@ int git_remote__get_http_proxy(git_remote *remote, bool use_ssl, char **proxy_ur
goto found; goto found;
} }
/* HTTP_PROXY / HTTPS_PROXY environment variables */ /* http_proxy / https_proxy environment variables */
error = git__getenv(&val, use_ssl ? "HTTPS_PROXY" : "HTTP_PROXY"); error = git__getenv(&val, use_ssl ? "https_proxy" : "http_proxy");
/* try uppercase environment variables */
if (error == GIT_ENOTFOUND)
error = git__getenv(&val, use_ssl ? "HTTPS_PROXY" : "HTTP_PROXY");
if (error < 0) { if (error < 0) {
if (error == GIT_ENOTFOUND) { if (error == GIT_ENOTFOUND) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment