From a456c50df437616648d45a73c711d78804ded21d Mon Sep 17 00:00:00 2001
From: Gerrit Drost <gdrost@vcn.nl>
Date: Fri, 23 May 2014 16:20:27 +0200
Subject: [PATCH] Reverted the changes previously made in favor of a different
 approach as requested in https://github.com/cboden/Ratchet/pull/188

---
 src/Ratchet/App.php | 45 +++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/src/Ratchet/App.php b/src/Ratchet/App.php
index 229a448..5cafeae 100644
--- a/src/Ratchet/App.php
+++ b/src/Ratchet/App.php
@@ -1,5 +1,7 @@
 <?php
+
 namespace Ratchet;
+
 use React\EventLoop\LoopInterface;
 use React\EventLoop\Factory as LoopFactory;
 use React\Socket\Server as Reactor;
@@ -49,16 +51,12 @@ class App {
     protected $_routeCounter = 0;
 
     /**
-     * @param string        $httpHost           HTTP hostname clients intend to connect to. MUST match JS `new WebSocket('ws://$httpHost')
-     * @param int           $port               Port to listen on
-     * @param string        $address            IP address to bind to. Default is localhost/proxy only. '0.0.0.0' for any machine
-     * @param array         $flashAllowedHosts  associative array with hostnames as key and ports as value. These domains are the domains the flash websocket fallback may connect from
-     * @param int           $flashPort          the port the flash cross-domain-policy file will be hosted on
-     * @param string        $flashAddress       the IP address the flash cross-domain-policy server will bind to
-     * @param LoopInterface $loop               Specific React\EventLoop to bind the application to. null will create one for you.
+     * @param string        $httpHost HTTP hostname clients intend to connect to. MUST match JS `new WebSocket('ws://$httpHost');`
+     * @param int           $port     Port to listen on. If 80, assuming production, Flash on 843 otherwise expecting Flash to be proxied through 8843
+     * @param string        $address  IP address to bind to. Default is localhost/proxy only. '0.0.0.0' for any machine.
+     * @param LoopInterface $loop     Specific React\EventLoop to bind the application to. null will create one for you.
      */
-    public function __construct($httpHost = 'localhost', $port = 8080, $address = '127.0.0.1', $flashAllowedHosts = false, $flashPort = 8843, $flashAddress = '0.0.0.0', LoopInterface $loop = null) {
-        
+    public function __construct($httpHost = 'localhost', $port = 8080, $address = '127.0.0.1', LoopInterface $loop = null) {
         if (extension_loaded('xdebug')) {
             trigger_error("XDebug extension detected. Remember to disable this if performance testing or going live!", E_USER_WARNING);
         }
@@ -79,20 +77,26 @@ class App {
         $this->routes  = new RouteCollection;
         $this->_server = new IoServer(new HttpServer(new Router(new UrlMatcher($this->routes, new RequestContext))), $socket, $loop);
 
-        if ($flashAllowedHosts === false) {
-            $flashAllowedHosts = array( 80 => $httpHost );
-        }
-        
         $policy = new FlashPolicy();
-        
-        foreach ($flashAllowedHosts as $flashAllowedHost => $flashAllowedPort) {            
-            $policy->addAllowedAccess($flashAllowedHost, $flashAllowedPort);
-        }
-        
+        $policy->addAllowedAccess($httpHost, 80);
+        $policy->addAllowedAccess($httpHost, $port);
         $flashSock = new Reactor($loop);
-        
         $this->flashServer = new IoServer($policy, $flashSock);
-        $flashSock->listen($flashPort, $flashAddress);
+
+        if (80 == $port) {
+            $flashSock->listen(843, '0.0.0.0');
+        } else {
+            $flashSock->listen(8843);
+        }
+    }
+    
+    /**
+     * Returns the FlashPolicy running in the FlashServer. Modifications of this object take effect immediately!
+     * 
+     * @return FlashPolicy
+     */
+    public function getFlashPolicy() {
+        return $this->flashServer->getApp();
     }
 
     /**
@@ -136,3 +140,4 @@ class App {
         $this->_server->run();
     }
 }
+