Merge branch 'allow-setting-secureContext'

ratchetphp · Jan 2, 2017 · e42f10a · e42f10a
2 parents 67acb1f + a75de4a
commit e42f10a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
     }
   , "require": {
         "php": ">=5.4"
-      , "react/socket-client": "^0.4.3|^0.5"
+      , "react/socket-client": "^0.5"
       , "ratchet/rfc6455": "^0.2.1"
     }
   , "suggest": {

diff --git a/src/Connector.php b/src/Connector.php
@@ -17,15 +17,15 @@ class Connector {
     protected $_secureConnector;
     protected $_negotiator;
 
-    public function __construct(LoopInterface $loop, Resolver $resolver = null) {
+    public function __construct(LoopInterface $loop, Resolver $resolver = null, array $secureContext = []) {
         if (null === $resolver) {
             $factory  = new DnsFactory();
             $resolver = $factory->create('8.8.8.8', $loop);
         }
 
         $this->_loop            = $loop;
         $this->_connector       = new SocketConnector($loop, $resolver);
-        $this->_secureConnector = new SecureConnector($this->_connector, $loop);
+        $this->_secureConnector = new SecureConnector($this->_connector, $loop, $secureContext);
         $this->_negotiator      = new ClientNegotiator;
     }