Skip to content

Commit

Permalink
Merge pull request #4 from mzabriskie/master
Browse files Browse the repository at this point in the history
Adding a way to disable all proxy processing (axios#691)
  • Loading branch information
GulajavaMinistudio authored Aug 15, 2017
2 parents d84174b + 07a7b7c commit 2ca9ff1
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 1 deletion.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ These are the available config options for making requests. Only the `url` is re
httpsAgent: new https.Agent({ keepAlive: true }),

// 'proxy' defines the hostname and port of the proxy server
// Use `false` to disable proxies, ignoring environment variables.
// `auth` indicates that HTTP Basic auth should be used to connect to the proxy, and
// supplies credentials.
// This will set an `Proxy-Authorization` header, overwriting any existing
Expand Down
2 changes: 1 addition & 1 deletion lib/adapters/http.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ module.exports = function httpAdapter(config) {
};

var proxy = config.proxy;
if (!proxy) {
if (!proxy && proxy !== false) {
var proxyEnv = protocol.slice(0, -1) + '_proxy';
var proxyUrl = process.env[proxyEnv] || process.env[proxyEnv.toUpperCase()];
if (proxyUrl) {
Expand Down
17 changes: 17 additions & 0 deletions test/unit/adapters/http.js
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,23 @@ module.exports = {
});
},

testHTTPProxyDisabled: function(test) {
// set the env variable
process.env.http_proxy = 'http://does-not-exists.example.com:4242/';

server = http.createServer(function(req, res) {
res.setHeader('Content-Type', 'text/html; charset=UTF-8');
res.end('123456789');
}).listen(4444, function() {
axios.get('http://localhost:4444/', {
proxy: false
}).then(function(res) {
test.equal(res.data, '123456789', 'should not pass through proxy');
test.done();
});
});
},

testHTTPProxyEnv: function(test) {
server = http.createServer(function(req, res) {
res.setHeader('Content-Type', 'text/html; charset=UTF-8');
Expand Down

0 comments on commit 2ca9ff1

Please sign in to comment.