Merge pull request socketio#1685 from rase-/fix/remote-address-in-handshake-obj

Fix remote address in handshake obj

Author: rauchg

lib/socket.js

@@ -108,7 +108,7 @@ Socket.prototype.buildHandshake = function(){
   return {
     headers: this.request.headers,
     time: (new Date) + '',
-    address: this.request.connection.address(),
+    address: this.conn.remoteAddress,
     xdomain: !!this.request.headers.origin,
     secure: !!this.request.connection.encrypted,
     issued: +(new Date),

package.json

@@ -19,7 +19,7 @@
     "test": "make test"
   },
   "dependencies": {
-    "engine.io": "Automattic/engine.io#588af6",
+    "engine.io": "Automattic/engine.io#15afd3",
     "socket.io-parser": "2.2.1",
     "socket.io-client": "Automattic/socket.io-client#05c9632",
     "socket.io-adapter": "0.2.0",

test/socket.io.js

@@ -116,7 +116,7 @@ describe('socket.io', function(){
         expect(s.handshake.time.split(' ').length > 0); // Is "multipart" string representation
 
         // Address, xdomain, secure, issued and url set
-        expect(s.handshake.address).to.not.be(undefined);
+        expect(s.handshake.address).to.be('127.0.0.1');
         expect(s.handshake.xdomain).to.be.a('boolean');
         expect(s.handshake.secure).to.be.a('boolean');
         expect(s.handshake.issued).to.be.a('number');