When detecting the existence of a proxy environment variable, check for HTTP versus HTTPS and uppercase vs lowercase

wibblymat · wibblymat · commit 59dee1c499c3 · 2013-02-22T23:44:26.000Z
diff --git a/lib/core/config.js b/lib/core/config.js
@@ -22,6 +22,11 @@ var folder = process.platform === 'win32'
   ? 'bower'
   : '.bower';
 
+var proxy = process.env.HTTPS_PROXY
+ || process.env.https_proxy
+ || process.env.HTTP_PROXY
+ || process.env.http_proxy;
+
 // Bower Config
 var config;
 try {
@@ -31,7 +36,8 @@ try {
     completion :  path.join(roaming, folder, 'completion'),
     json       : 'component.json',
     endpoint   : 'https://bower.herokuapp.com',
-    directory  : 'components'
+    directory  : 'components',
+    proxy      : proxy
   });
 } catch (e) {
   throw new Error('Unable to parse global .bowerrc file: ' + e.message);
diff --git a/lib/core/package.js b/lib/core/package.js
@@ -402,8 +402,8 @@ Package.prototype.download = function () {
 
   var src;
 
-  if (process.env.HTTP_PROXY) {
-    src = url.parse(process.env.HTTP_PROXY);
+  if (config.proxy) {
+    src = url.parse(config.proxy);
     src.path = this.assetUrl;
   } else {
     src  = url.parse(this.assetUrl);
@@ -601,7 +601,7 @@ Package.prototype.cache = function () {
       }
       template('action', { name: 'caching', shizzle: this.gitUrl }).on('data', this.emit.bind(this, 'data'));
       var url = this.gitUrl;
-      if (process.env.HTTP_PROXY) {
+      if (config.proxy) {
         url = url.replace(/^git:/, 'https:');
       }
 
diff --git a/lib/core/source.js b/lib/core/source.js
@@ -11,8 +11,8 @@ var config   = require('./config');
 
 var endpoint = config.endpoint + '/packages';
 
-if (process.env.HTTP_PROXY) {
-  request = request.defaults({ proxy: process.env.HTTP_PROXY, timeout: 5000 });
+if (config.proxy) {
+  request = request.defaults({ proxy: config.proxy, timeout: 5000 });
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ var config = require('./config');`
`11`	`11`
`12`	`12`	`var endpoint = config.endpoint + '/packages';`
`13`	`13`
`14`		`-if (process.env.HTTP_PROXY) {`
`15`		`- request = request.defaults({ proxy: process.env.HTTP_PROXY, timeout: 5000 });`
	`14`	`+if (config.proxy) {`
	`15`	`+ request = request.defaults({ proxy: config.proxy, timeout: 5000 });`
`16`	`16`	`}`
`17`	`17`
`18`	`18`