Only use scheme if no protocol is provided

Author: tschaub

index.js

@@ -15,11 +15,14 @@ http.request = function (params, cb) {
         params.host = params.hostname;
     }
 
-    if (params.protocol) {
-        params.scheme = params.protocol.split(':')[0];
+    if (!params.protocol) {
+        if (params.scheme) {
+            params.protocol = params.scheme + ':';
+        } else {
+            params.protocol = window.location.protocol;
+        }
     }
 
-    if (!params.scheme) params.scheme = window.location.protocol.split(':')[0];
     if (!params.host) {
         params.host = window.location.hostname || window.location.host;
     }
@@ -29,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 || '/')