Addressing PR feedback

This commit is contained in:
Christopher Bargren 2017-02-08 15:01:30 -07:00
parent 5f3276c7e6
commit 2af282d835

View File

@ -770,21 +770,14 @@ 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");
if (error < 0) {
if (error != GIT_ENOTFOUND) {
return error;
}
giterr_clear();
error = 0;
}
/* try lowercase environment variables */
/* http_proxy / https_proxy environment variables */
error = git__getenv(&val, use_ssl ? "https_proxy" : "http_proxy");
if (error == GIT_ENOTFOUND) {
/* try uppercase environment variables */
error = git__getenv(&val, use_ssl ? "HTTPS_PROXY" : "HTTP_PROXY");
}
if (error < 0) {
if (error == GIT_ENOTFOUND) {
giterr_clear();