From: Clemens Buchacher Date: Sat, 03 Mar 2012 14:50:53 GMT Subject: [PATCH] http.proxy: also mention https_proxy and all_proxy Message-ID: <20120303145053.GA29948@ecki> The current wording of the http.proxy documentation suggests that http_proxy is somehow equivalent to http.proxy. However, while http.proxy (by the means of curl's CURLOPT_PROXY option) overrides the proxy for both HTTP and HTTPS protocols, the http_proxy environment variable is used only for HTTP. But since the docs mention only http_proxy, a user might expect it to apply to all HTTP-like protocols. Avoid any such misunderstanding by explicitly mentioning https_proxy and all_proxy as well. Signed-off-by: Clemens Buchacher --- As you can maybe guess from the commit message, I was bitten by this myself. I also found a couple of questions online where users were expecting the http_proxy environment variable to apply to HTTPS as well. Hopefully, this will prevent some confusion in the future. Clemens Documentation/config.txt | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index abeb82b..7d197bb 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1258,9 +1258,10 @@ help.autocorrect:: This is the default. http.proxy:: - Override the HTTP proxy, normally configured using the 'http_proxy' - environment variable (see linkgit:curl[1]). This can be overridden - on a per-remote basis; see remote..proxy + Override the HTTP proxy, normally configured using the 'http_proxy', + 'https_proxy', and 'all_proxy' environment variables (see + linkgit:curl[1]). This can be overridden on a per-remote basis; see + remote..proxy http.cookiefile:: File containing previously stored cookie lines which should be used -- 1.7.9.1