Formatting, removed flash check
This commit is contained in:
		
							parent
							
								
									f5d148cdc4
								
							
						
					
					
						commit
						c179d60e77
					
				@ -87,22 +87,10 @@ class App {
 | 
				
			|||||||
        $policy->addAllowedAccess($httpHost, $port);
 | 
					        $policy->addAllowedAccess($httpHost, $port);
 | 
				
			||||||
        $flashSock = new Reactor($loop);
 | 
					        $flashSock = new Reactor($loop);
 | 
				
			||||||
        $this->flashServer = new IoServer($policy, $flashSock);
 | 
					        $this->flashServer = new IoServer($policy, $flashSock);
 | 
				
			||||||
 | 
					        if (80 == $port) {
 | 
				
			||||||
        //check if another App is already running a flash policy server on 843
 | 
					 | 
				
			||||||
        $test = @fsockopen('127.0.0.1', 843, $errno, $errstr, 5);
 | 
					 | 
				
			||||||
        
 | 
					 | 
				
			||||||
        //if not start a flash policy serever
 | 
					 | 
				
			||||||
        if(is_resource($test) === false){
 | 
					 | 
				
			||||||
          $policy = new FlashPolicy;
 | 
					 | 
				
			||||||
          $policy->addAllowedAccess($httpHost, 80);
 | 
					 | 
				
			||||||
          $policy->addAllowedAccess($httpHost, $port);
 | 
					 | 
				
			||||||
          $flashSock = new Reactor($loop);
 | 
					 | 
				
			||||||
          $this->flashServer = new IoServer($policy, $flashSock);
 | 
					 | 
				
			||||||
          
 | 
					 | 
				
			||||||
            $flashSock->listen(843, '0.0.0.0');
 | 
					            $flashSock->listen(843, '0.0.0.0');
 | 
				
			||||||
        } else {
 | 
					        } else {
 | 
				
			||||||
          fclose($test);
 | 
					            $flashSock->listen(8843);
 | 
				
			||||||
          trigger_error('flash socket server already running on 843', E_USER_NOTICE);
 | 
					 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -107,7 +107,6 @@ class ServerProtocol implements MessageComponentInterface, WsServerInterface {
 | 
				
			|||||||
                    $json = $json[0];
 | 
					                    $json = $json[0];
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                //procURI should be un prefixed
 | 
					 | 
				
			||||||
                $this->_decorating->onCall($from, $callID, $from->getUri($procURI), $json);
 | 
					                $this->_decorating->onCall($from, $callID, $from->getUri($procURI), $json);
 | 
				
			||||||
            break;
 | 
					            break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -77,7 +77,6 @@ class WampConnection extends AbstractConnectionDecorator {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * Get the full request URI from the connection object if a prefix has been established for it
 | 
					     * Get the full request URI from the connection object if a prefix has been established for it
 | 
				
			||||||
     * Compliant with WAMP Spec for curie URIs
 | 
					 | 
				
			||||||
     * @param string $uri
 | 
					     * @param string $uri
 | 
				
			||||||
     * @return string
 | 
					     * @return string
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user