Merge pull request #64 from tschaub/protocol

Respect protocol

Author: James Halliday

index.js

@@ -14,8 +14,15 @@ http.request = function (params, cb) {
     if (!params.host && params.hostname) {
         params.host = params.hostname;
     }
-    
-    if (!params.scheme) params.scheme = window.location.protocol.split(':')[0];
+
+    if (!params.protocol) {
+        if (params.scheme) {
+            params.protocol = params.scheme + ':';
+        } else {
+            params.protocol = window.location.protocol;
+        }
+    }
+
     if (!params.host) {
         params.host = window.location.hostname || window.location.host;
     }
@@ -25,7 +32,7 @@ http.request = function (params, cb) {
         }
         params.host = params.host.split(':')[0];
     }
-    if (!params.port) params.port = params.scheme == 'https' ? 443 : 80;
+    if (!params.port) params.port = params.protocol == 'https:' ? 443 : 80;
 
     var req = new Request(new xhrHttp, params);
     if (cb) req.on('response', cb);

lib/request.js

@@ -9,7 +9,7 @@ var Request = module.exports = function (xhr, params) {
     self.xhr = xhr;
     self.body = [];
 
-    self.uri = (params.scheme || 'http') + '://'
+    self.uri = (params.protocol || 'http:') + '//'
         + params.host
         + (params.port ? ':' + params.port : '')
         + (params.path || '/')

test/request_url.js

@@ -48,6 +48,20 @@ test('Test full url object', function(t) {
 
 });
 
+test('Test alt protocol', function(t) {
+  var params = {
+    protocol: "foo:",
+    hostname: "localhost",
+    port: "3000",
+    path: "/bar"
+  };
+
+  var request = http.get(params, noop);
+
+  t.equal( request.uri, 'foo://localhost:3000/bar', 'Url should be correct');
+  t.end();
+
+});
 
 test('Test string as parameters', function(t) {
   var url = '/api/foo';