Skip to content

Commit b9a7c8b

Browse files
committed
Merge pull request socketio#325 from 3rd-Eden/ssl
See nodejs/node-v0.x-archive#1055
2 parents 29a8fff + e4ac72a commit b9a7c8b

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

lib/manager.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -817,10 +817,15 @@ Manager.prototype.handleHandshake = function (data, req, res) {
817817
*/
818818

819819
Manager.prototype.handshakeData = function (data) {
820-
var connectionAddress = null;
821-
if (data.request.connection.address) {
822-
connectionAddress = data.request.connection.address();
820+
var connection = data.request.connection
821+
, connectionAddress;
822+
823+
if (connection.address) {
824+
connectionAddress = connection.address();
825+
} else if (connection.socket && connection.socket.address) {
826+
connectionAddress = connection.socket.address()
823827
}
828+
824829
return {
825830
headers: data.headers
826831
, address: connectionAddress

0 commit comments

Comments
 (0)