From e664c716e67a0ff79fe23fc614578b22fe36aa6a Mon Sep 17 00:00:00 2001 From: Arnout Kazemier Date: Fri, 5 Aug 2011 15:24:16 +0200 Subject: [PATCH 1/4] Added support for different policy file ports without having to port forward 843 on the server side --- lib/socket.js | 1 + lib/transports/flashsocket.js | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/lib/socket.js b/lib/socket.js index 00016bbcc..eedb16374 100644 --- a/lib/socket.js +++ b/lib/socket.js @@ -36,6 +36,7 @@ , 'max reconnection attempts': 10 , 'sync disconnect on unload': true , 'auto connect': true + , 'flash policy port': 843 }; io.util.merge(this.options, options); diff --git a/lib/transports/flashsocket.js b/lib/transports/flashsocket.js index b85001c91..9ca6a1895 100644 --- a/lib/transports/flashsocket.js +++ b/lib/transports/flashsocket.js @@ -105,6 +105,7 @@ Flashsocket.prototype.ready = function (socket, fn) { function init () { var options = socket.options + , port = options['flash policy port'] , path = [ 'http' + (options.secure ? 's' : '') + ':/' , options.host + ':' + options.port @@ -121,6 +122,10 @@ WEB_SOCKET_SWF_LOCATION = path.join('/'); } + if (port !== 843) { + WebSocket.loadManualPolicyFile('xmlsocket://' + options.host + ':' + port); + } + WebSocket.__initialize(); Flashsocket.loaded = true; } From 46f9733d4e8e918ad7f0258df781157f6653c45e Mon Sep 17 00:00:00 2001 From: Arnout Kazemier Date: Sat, 6 Aug 2011 17:04:21 +0200 Subject: [PATCH 2/4] Fixed small typo, and tested it with server intergration. Flash socket is answered using the net server on a different port --- lib/transports/flashsocket.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/transports/flashsocket.js b/lib/transports/flashsocket.js index 9ca6a1895..59c6957b7 100644 --- a/lib/transports/flashsocket.js +++ b/lib/transports/flashsocket.js @@ -123,7 +123,7 @@ } if (port !== 843) { - WebSocket.loadManualPolicyFile('xmlsocket://' + options.host + ':' + port); + WebSocket.loadFlashPolicyFile('xmlsocket://' + options.host + ':' + port); } WebSocket.__initialize(); From 533b4f539fc0c0fa2c52c432e424448d81f1f1c2 Mon Sep 17 00:00:00 2001 From: Arnout Kazemier Date: Sat, 6 Aug 2011 20:04:13 +0200 Subject: [PATCH 3/4] Fixed comment block --- lib/transports/flashsocket.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/transports/flashsocket.js b/lib/transports/flashsocket.js index 59c6957b7..d321aeaaa 100644 --- a/lib/transports/flashsocket.js +++ b/lib/transports/flashsocket.js @@ -44,7 +44,7 @@ Flashsocket.prototype.name = 'flashsocket'; /** - *Disconnect the established `FlashSocket` connection. This is done by adding a + * Disconnect the established `FlashSocket` connection. This is done by adding a * new task to the FlashSocket. The rest will be handled off by the `WebSocket` * transport. * From 6609dee4dbfca18f388ad5757c573ec87a0077eb Mon Sep 17 00:00:00 2001 From: Arnout Kazemier Date: Tue, 9 Aug 2011 19:21:01 +0200 Subject: [PATCH 4/4] Added default socket.io-flashsocket port --- lib/socket.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/socket.js b/lib/socket.js index eedb16374..bc1a5a295 100644 --- a/lib/socket.js +++ b/lib/socket.js @@ -36,7 +36,7 @@ , 'max reconnection attempts': 10 , 'sync disconnect on unload': true , 'auto connect': true - , 'flash policy port': 843 + , 'flash policy port': 10843 }; io.util.merge(this.options, options);