diff options
| author | Mike McQuaid | 2017-12-19 09:16:04 +0000 |
|---|---|---|
| committer | GitHub | 2017-12-19 09:16:04 +0000 |
| commit | 426c998ff513a182aced1a5a4c4b7ec6f9203288 (patch) | |
| tree | eab889853987b207cb70ec138caf3d733606ef37 | |
| parent | b4d43e950fd45c24e48d6ebfd3013357abcd21a9 (diff) | |
| parent | 28a0e445f0fb6aa02fc1be41bdd3cae11065e4fe (diff) | |
| download | brew-426c998ff513a182aced1a5a4c4b7ec6f9203288.tar.bz2 | |
Merge pull request #3584 from Quesar/fix-proxy-config
Added no_proxy to filtered env
| -rw-r--r-- | Library/Homebrew/manpages/brew.1.md.erb | 8 | ||||
| -rwxr-xr-x | bin/brew | 2 | ||||
| -rw-r--r-- | docs/Manpage.md | 8 | ||||
| -rw-r--r-- | manpages/brew.1 | 9 |
4 files changed, 23 insertions, 4 deletions
diff --git a/Library/Homebrew/manpages/brew.1.md.erb b/Library/Homebrew/manpages/brew.1.md.erb index 321318b16..24f1b78b8 100644 --- a/Library/Homebrew/manpages/brew.1.md.erb +++ b/Library/Homebrew/manpages/brew.1.md.erb @@ -251,8 +251,14 @@ can take several different forms: Sets the FTP proxy to be used by `curl`, `git` and `svn` when downloading through Homebrew. + * `no_proxy`: + Sets the comma-separated list of hostnames and domain names that should be excluded from proxying + by `curl`, `git` and `svn` when downloading through Homebrew. + ## USING HOMEBREW BEHIND A PROXY -Use the `http_proxy`, `https_proxy` and/or `ftp_proxy` documented above. For example for an unauthenticated HTTP proxy: +Use the `http_proxy`, `https_proxy`, `no_proxy` and/or `ftp_proxy` documented above. + +For example for an unauthenticated HTTP proxy: export http_proxy=http://<host>:<port> @@ -67,7 +67,7 @@ then FILTERED_ENV=() # Filter all but the specific variables. for VAR in HOME SHELL PATH TERM LOGNAME USER CI TRAVIS SSH_AUTH_SOCK SUDO_ASKPASS \ - http_proxy https_proxy ftp_proxy HTTPS_PROXY FTP_PROXY \ + http_proxy https_proxy ftp_proxy no_proxy HTTPS_PROXY FTP_PROXY \ "${!HOMEBREW_@}" "${!TRAVIS_@}" "${!JENKINS_@}" do # Skip if variable value is empty. diff --git a/docs/Manpage.md b/docs/Manpage.md index a3015c864..f42009ab5 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -1096,8 +1096,14 @@ can take several different forms: Sets the FTP proxy to be used by `curl`, `git` and `svn` when downloading through Homebrew. + * `no_proxy`: + Sets the comma-separated list of hostnames and domain names that should be excluded from proxying + by `curl`, `git` and `svn` when downloading through Homebrew. + ## USING HOMEBREW BEHIND A PROXY -Use the `http_proxy`, `https_proxy` and/or `ftp_proxy` documented above. For example for an unauthenticated HTTP proxy: +Use the `http_proxy`, `https_proxy`, `no_proxy` and/or `ftp_proxy` documented above. + +For example for an unauthenticated HTTP proxy: export http_proxy=http://`host`:`port` diff --git a/manpages/brew.1 b/manpages/brew.1 index 55c526f67..d8cea8975 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -1120,8 +1120,15 @@ Sets the HTTPS proxy to be used by \fBcurl\fR, \fBgit\fR and \fBsvn\fR when down \fBftp_proxy\fR Sets the FTP proxy to be used by \fBcurl\fR, \fBgit\fR and \fBsvn\fR when downloading through Homebrew\. . +.TP +\fBno_proxy\fR +Sets the comma\-separated list of hostnames and domain names that should be excluded from proxying by \fBcurl\fR, \fBgit\fR and \fBsvn\fR when downloading through Homebrew\. +. .SH "USING HOMEBREW BEHIND A PROXY" -Use the \fBhttp_proxy\fR, \fBhttps_proxy\fR and/or \fBftp_proxy\fR documented above\. For example for an unauthenticated HTTP proxy: +Use the \fBhttp_proxy\fR, \fBhttps_proxy\fR, \fBno_proxy\fR and/or \fBftp_proxy\fR documented above\. +. +.P +For example for an unauthenticated HTTP proxy: . .IP "" 4 . |