Merge branch 'master' of github.com:LearnBoost/socket.io

rauchg · rauchg · commit 65b82727242f · 2011-07-12T04:29:56.000-03:00
diff --git a/lib/manager.js b/lib/manager.js
@@ -805,10 +805,21 @@ Manager.prototype.handleHandshake = function (data, req, res) {
  */
 
 Manager.prototype.handshakeData = function (data) {
-  var connectionAddress = null;
-  if (data.request.connection.address) {
-    connectionAddress = data.request.connection.address();
+  var connection = data.request.connection
+    , connectionAddress;
+
+  if (connection.remoteAddress) {
+    connectionAddress = {
+        address: connection.remoteAddress
+      , port: connection.remotePort
+    }; 
+  } else if (connection.socket && connection.socket.remoteAddress) {
+    connectionAddress = {
+        address: connection.socket.remoteAddress
+      , port: connection.socket.remotePort
+    }; 
   }
+
   return {
       headers: data.headers
     , address: connectionAddress
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "socket.io"
   , "version": "0.7.6"
-  , "description": "Realtime apps made cross-browser & easy with a WebSocket-like API"
+  , "description": "Real-time apps made cross-browser & easy with a WebSocket-like API"
   , "homepage": "http://socket.io"
   , "keywords": ["websocket", "socket", "realtime", "socket.io", "comet", "ajax"]
   , "author": "Guillermo Rauch <guillermo@learnboost.com>"
diff --git a/test/namespace.test.js b/test/namespace.test.js
@@ -80,8 +80,8 @@ module.exports = {
         fn(null, true);
       })
       .on('connection', function (socket) {
-        socket.handshake.address.address.should.equal('127.0.0.1');
-        socket.handshake.address.port.should.equal(ports);
+        (!!socket.handshake.address.address).should.be.true;
+        (!!socket.handshake.address.port).should.be.true;
         socket.handshake.headers.host.should.equal('localhost');
         socket.handshake.headers.connection.should.equal('keep-alive');
         socket.handshake.time.should.match(/GMT/);
diff --git a/test/transports.websocket.test.js b/test/transports.websocket.test.js
@@ -1493,8 +1493,8 @@ module.exports = {
       , ws;
 
     io.sockets.on('connection', function (socket) {
-      socket.handshake.address.address.should.equal('127.0.0.1');
-      socket.handshake.address.port.should.equal(ports);
+      (!!socket.handshake.address.address).should.be.true;
+      (!!socket.handshake.address.port).should.be.true;
       socket.handshake.headers.host.should.equal('localhost');
       socket.handshake.headers.connection.should.equal('keep-alive');
       socket.handshake.time.should.match(/GMT/);

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "socket.io"`
`3`	`3`	`, "version": "0.7.6"`
`4`		`- , "description": "Realtime apps made cross-browser & easy with a WebSocket-like API"`
	`4`	`+ , "description": "Real-time apps made cross-browser & easy with a WebSocket-like API"`
`5`	`5`	`, "homepage": "http://socket.io"`
`6`	`6`	`, "keywords": ["websocket", "socket", "realtime", "socket.io", "comet", "ajax"]`
`7`	`7`	`, "author": "Guillermo Rauch <guillermo@learnboost.com>"`