Merge branch 'master' into hybi-07

Conflicts:
	WebSocketMain.swf
	WebSocketMainInsecure.zip

1 files changed, 22 insertions, 0 deletions

diff --git a/flash-src/src/net/gimite/websocket/WebSocketMainInsecure.as b/flash-src/src/net/gimite/websocket/WebSocketMainInsecure.as
new file mode 100644
index 0000000..214f31e
--- /dev/null
+++ b/flash-src/src/net/gimite/websocket/WebSocketMainInsecure.as
@@ -0,0 +1,22 @@
+// Copyright: Hiroshi Ichikawa <http://gimite.net/en/>
+// License: New BSD License
+// Reference: http://dev.w3.org/html5/websockets/
+// Reference: http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-07
+
+package net.gimite.websocket {
+
+import flash.system.Security;
+
+public class WebSocketMainInsecure extends WebSocketMain {
+
+  public function WebSocketMainInsecure() {
+    Security.allowDomain("*");
+    // Also allows HTTP -> HTTPS call. Since we have already allowed arbitrary domains, allowing
+    // HTTP -> HTTPS would not be more dangerous.
+    Security.allowInsecureDomain("*");
+    super();
+  }
+  
+}
+
+}