Merge pull request #1599 from simov/invalid-uri-no-proxy

Move getProxyFromURI logic below the check for Invaild URI (#1595)

request.js

@@ -444,15 +444,6 @@ Request.prototype.init = function (options) {
     self.rejectUnauthorized = false
   }
 
-  if (!self.hasOwnProperty('proxy')) {
-    self.proxy = getProxyFromURI(self.uri)
-  }
-
-  self.tunnel = getTunnelOption(self, options)
-  if (self.proxy) {
-    self.setupTunnel()
-  }
-
   if (!self.uri.pathname) {self.uri.pathname = '/'}
 
   if (!(self.uri.host || (self.uri.hostname && self.uri.port)) && !self.uri.isUnix) {
@@ -470,6 +461,15 @@ Request.prototype.init = function (options) {
     return self.emit('error', new Error(message))
   }
 
+  if (!self.hasOwnProperty('proxy')) {
+    self.proxy = getProxyFromURI(self.uri)
+  }
+
+  self.tunnel = getTunnelOption(self, options)
+  if (self.proxy) {
+    self.setupTunnel()
+  }
+
   self._redirect.onRequest(options)
 
   self.setHost = false

tests/test-errors.js

@@ -30,6 +30,17 @@ tape('invalid uri 2', function(t) {
   t.end()
 })
 
+tape('invalid uri + NO_PROXY', function(t) {
+  process.env.NO_PROXY = 'google.com'
+  t.throws(function() {
+    request({
+      uri: 'invalid'
+    })
+  }, /^Error: Invalid URI/)
+  delete process.env.NO_PROXY
+  t.end()
+})
+
 tape('deprecated unix URL', function(t) {
   t.throws(function() {
     request({