From 44967bf9510b884c4580419ba95bfd91713dfadb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emanuel=20Inderm=C3=BChle?= <emanuel@inthemill.ch>
Date: Sun, 20 Aug 2017 23:56:59 +0200
Subject: [PATCH] Adding a way to disable all proxy processing (#691) again

---
 lib/adapters/http.proxy.js  | 4 ++--
 test/unit/adapters/proxy.js | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/adapters/http.proxy.js b/lib/adapters/http.proxy.js
index d2ba2d12d5..4f8ccd22b1 100644
--- a/lib/adapters/http.proxy.js
+++ b/lib/adapters/http.proxy.js
@@ -20,7 +20,7 @@ var getProxyForUrl = require('proxy-from-env').getProxyForUrl;
  */
 module.exports = function getProxy(config) {
   var proxy = config.proxy;
-  if (!proxy) {
+  if (!proxy && proxy !== false) {
     var envProxy = getProxyForUrl(config.url);
     if (envProxy) {
       var parsedProxyUrl = url.parse(envProxy);
@@ -38,5 +38,5 @@ module.exports = function getProxy(config) {
       }
     }
   }
-  return proxy;
+  return proxy || undefined;
 };
diff --git a/test/unit/adapters/proxy.js b/test/unit/adapters/proxy.js
index 528dede68f..878d96471a 100644
--- a/test/unit/adapters/proxy.js
+++ b/test/unit/adapters/proxy.js
@@ -91,6 +91,13 @@ module.exports = {
     test.done();
   },
 
+  proxyUnsetFromConfigOverridesProxyFromEnv: function(test) {
+    process.env.http_proxy = 'http://bob:secret@corpproxy.com:77/';
+    var proxy = getProxy(config({proxy: false}));
+    test.equal(proxy, undefined);
+    test.done();
+  },
+
   readProxyFromCorrectEnv: function(test) {
     process.env.https_proxy = 'http://corpproxy.com/';
     test.equal(getProxy(config()), undefined);