Merge pull request #366 from Automattic/fix-default-port

fix default port detection when host is specified

lib/socket.js

@@ -57,7 +57,12 @@ function Socket(uri, opts){
   if (opts.host) {
     var pieces = opts.host.split(':');
     opts.hostname = pieces.shift();
-    if (pieces.length) opts.port = pieces.pop();
+    if (pieces.length) {
+      opts.port = pieces.pop();
+    } else if (!opts.port) {
+      // if no port is specified manually, use the protocol default
+      opts.port = self.secure ? '443' : '80';
+    }
   }
 
   this.agent = opts.agent || false;

test/engine.io-client.js

@@ -8,4 +8,24 @@ describe('engine.io-client', function () {
     expect(eio.protocol).to.be.a('number');
   });
 
+  it('should properly parse http uri without port', function() {
+    var server = eio('http://localhost');
+    expect(server.port).to.be('80');
+  });
+
+  it('should properly parse https uri without port', function() {
+    var server = eio('https://localhost');
+    expect(server.port).to.be('443');
+  });
+
+  it('should properly parse wss uri without port', function() {
+    var server = eio('wss://localhost');
+    expect(server.port).to.be('443');
+  });
+
+  it('should properly parse wss uri with port', function() {
+    var server = eio('wss://localhost:2020');
+    expect(server.port).to.be('2020');
+  });
+
 });