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

Add support for lowercase proxy environment variables

Merge pull request #4112 from cbargren/fix/proxy-env-vars
Add support for lowercase proxy environment variables
b0c3fa36 · Edward Thomson · GitHub · 683ff4f3 · 61189a11 · b0c3fa36
Commit b0c3fa36 authored Feb 10, 2017 by Edward Thomson Committed by GitHub Feb 10, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

src/remote.c
+6 -2

No files found.
--- 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) {