Merge pull request #613 from lexander/master

Fixes #583, moved initialization of self.uri.pathname

index.js

@@ -93,7 +93,7 @@ function copy (obj) {
   return o
 }
 
-var isUrl = /^https?:/
+var isUrl = /^https?:/i
 
 var globalPool = {}
 
@@ -188,8 +188,10 @@ Request.prototype.init = function (options) {
       self.tunnel = true
     }
   }
+
+  if (!self.uri.pathname) {self.uri.pathname = '/'}
 
-  if (!self.uri.host || !self.uri.pathname) {
+  if (!self.uri.host) {
     // Invalid URI: it may generate lot of bad errors, like "TypeError: Cannot call method 'indexOf' of undefined" in CookieJar
     // Detect and reject it as soon as possible
     var faultyUri = url.format(self.uri)
@@ -226,7 +228,6 @@ Request.prototype.init = function (options) {
 
   self.jar(self._jar || options.jar)
 
-  if (!self.uri.pathname) {self.uri.pathname = '/'}
   if (!self.uri.port) {
     if (self.uri.protocol == 'http:') {self.uri.port = 80}
     else if (self.uri.protocol == 'https:') {self.uri.port = 443}

tests/test-isUrl.js

@@ -0,0 +1,28 @@
+var assert = require('assert')
+  , request = require('../index')
+  , http = require('http')
+  ;
+
+var s = http.createServer(function(req, res) {
+  res.statusCode = 200;
+  res.end('');
+}).listen(6767, function () {
+
+  // Test lowercase
+  request('http://localhost:6767', function (err, resp, body) {
+    // just need to get here without throwing an error
+    assert.equal(true, true);
+  })
+
+  // Test uppercase
+  request('HTTP://localhost:6767', function (err, resp, body) {
+    assert.equal(true, true);
+  })
+
+  // Test mixedcase
+  request('HtTp://localhost:6767', function (err, resp, body) {
+    assert.equal(true, true);
+    // clean up
+    s.close();
+  })
+})