diff options
| author | isaacs <i@izs.me> | 2012-08-21 15:29:03 -0700 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2012-08-21 15:29:37 -0700 |
| commit | 2bcb9ab7bcd474590f109bd04c43ba8e39a90dfa (patch) | |
| tree | 225e7199ccab16b9d8fad19c5001a0a4991f5f07 /deps/npm/lib/utils/fetch.js | |
| parent | badbd1af27f5f3fd07862b8ee7d0810e7ae9ef56 (diff) | |
| download | node-2bcb9ab7bcd474590f109bd04c43ba8e39a90dfa.tar.gz | |
npm: Upgrade to 1.1.55
Diffstat (limited to 'deps/npm/lib/utils/fetch.js')
| -rw-r--r-- | deps/npm/lib/utils/fetch.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/deps/npm/lib/utils/fetch.js b/deps/npm/lib/utils/fetch.js index 6042abc52..b98852066 100644 --- a/deps/npm/lib/utils/fetch.js +++ b/deps/npm/lib/utils/fetch.js @@ -65,9 +65,10 @@ function makeRequest (remote, fstr, headers) { "Auth required and none provided. Please run 'npm adduser'")) } - var proxy = npm.config.get( remote.protocol === "https:" - ? "https-proxy" - : "proxy") + var proxy + if (remote.protocol !== "https:" || !(proxy = npm.config.get("https-proxy"))) { + proxy = npm.config.get("proxy") + } var opts = { url: remote , proxy: proxy |