Calling Security.loadPolicyFile() with port 843 if Flash.loadFlashPolicyFile() has not been called.

Renaming WebSocket.loadPolicyFile() to WebSocket.loadFlashPolicyFile().
WebSocket.loadFlashPolicyFile() now expects URL including xmlsocket://.

4 files changed, 18 insertions, 7 deletions

diff --git a/WebSocketMain.swf b/WebSocketMain.swf
index 9c979af..575591d 100644
--- a/WebSocketMain.swf
+++ b/WebSocketMain.swf
diff --git a/WebSocketMainInsecure.zip b/WebSocketMainInsecure.zip
index 588e51a..8ce4aef 100644
--- a/WebSocketMainInsecure.zip
+++ b/WebSocketMainInsecure.zip
diff --git a/flash-src/WebSocketMain.as b/flash-src/WebSocketMain.as
index 166b72b..dc7483a 100644
--- a/flash-src/WebSocketMain.as
+++ b/flash-src/WebSocketMain.as
@@ -21,6 +21,7 @@ public class WebSocketMain extends Sprite {
 
   private var callerUrl:String;
   private var debug:Boolean = false;
+  private var manualPolicyFileLoaded:Boolean = false;
 
   public function WebSocketMain() {
     
@@ -50,6 +51,9 @@ public class WebSocketMain extends Sprite {
       url:String, protocol:String,
       proxyHost:String = null, proxyPort:int = 0,
       headers:String = null):WebSocket {
+    if (!manualPolicyFileLoaded) {
+      loadDefaultPolicyFile(url);
+    }
     return new WebSocket(this, url, protocol, proxyHost, proxyPort, headers);
   }
 
@@ -62,9 +66,16 @@ public class WebSocketMain extends Sprite {
     return URLUtil.getServerName(this.callerUrl);
   }
 
-  public function loadPolicyFile(url:String):void {
-    log("policy file: " + url);
-    Security.loadPolicyFile("xmlsocket://" + URLUtil.getServerNameWithPort(url));
+  private function loadDefaultPolicyFile(wsUrl:String):void {
+    var policyUrl:String = "xmlsocket://" + URLUtil.getServerName(wsUrl) + ":843";
+    log("policy file: " + policyUrl);
+    Security.loadPolicyFile(policyUrl);
+  }
+
+  public function loadManualPolicyFile(policyUrl:String):void {
+    log("policy file: " + policyUrl);
+    Security.loadPolicyFile(policyUrl);
+    manualPolicyFileLoaded = true;
   }
 
   public function log(message:String):void {
diff --git a/web_socket.js b/web_socket.js
index 842c6ae..baf3cf9 100644
--- a/web_socket.js
+++ b/web_socket.js
@@ -300,10 +300,10 @@
 
   WebSocket.__tasks = [];
 
-  WebSocket.loadPolicyFile = function(url) {
-      WebSocket.__addTask(function() {
-         WebSocket.__flash.loadPolicyFile(url);
-      });
+  WebSocket.loadFlashPolicyFile = function(url) {
+    WebSocket.__addTask(function() {
+      WebSocket.__flash.loadManualPolicyFile(url);
+    });
   }
 
   WebSocket.__initialize = function() {