Commit b0c3fa36c13e2ba76d4e6d16afbda62ebcfd5624
2017-02-10T16:15:41
Merge pull request #4112 from cbargren/fix/proxy-env-vars Add support for lowercase proxy environment variables
diff --git a/src/remote.c b/src/remote.c
index 8da7346..d3132f7 100644
--- a/src/remote.c
+++ b/src/remote.c
@@ -770,8 +770,12 @@ int git_remote__get_http_proxy(git_remote *remote, bool use_ssl, char **proxy_ur
goto found;
}
- /* HTTP_PROXY / HTTPS_PROXY environment variables */
- error = git__getenv(&val, use_ssl ? "HTTPS_PROXY" : "HTTP_PROXY");
+ /* http_proxy / https_proxy environment variables */
+ 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 == GIT_ENOTFOUND) {