Websocket: if there's an internal BIND address, it's most likely the …

…address the php server will have to connect to. Added a Todo to handle REST auth.
pydio · Dec 18, 2015 · d19bc7b · d19bc7b
1 parent 7c4c76c
commit d19bc7b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/core/src/plugins/core.mq/class.MqManager.php b/core/src/plugins/core.mq/class.MqManager.php
@@ -181,7 +181,7 @@ public function sendInstantMessage($xmlContent, $repositoryId, $targetUserId = n
             $input = serialize($input);
             $msg = WebSocketMessage::create($input);
             if (!isset($this->wsClient)) {
-                $this->wsClient = new WebSocket("ws://".$configs["WS_SERVER_HOST"].":".$configs["WS_SERVER_PORT"].$configs["WS_SERVER_PATH"]);
+                $this->wsClient = new WebSocket("ws://".$configs["WS_SERVER_BIND_HOST"].":".$configs["WS_SERVER_BIND_PORT"].$configs["WS_SERVER_PATH"]);
                 $this->wsClient->addHeader("Admin-Key", $configs["WS_SERVER_ADMIN"]);
                 @$this->wsClient->open();
             }

diff --git a/core/src/plugins/core.mq/ws-server.php b/core/src/plugins/core.mq/ws-server.php
@@ -98,6 +98,10 @@ public function onConnect(IWebSocketConnection $user)
         }
 
         $h = $user->getHeaders();
+        /*
+         * @todo
+         * Handle a REST auth instead of cookie based.
+         */
         $c = WebSocketFunctions::cookie_parse($h["Cookie"]);
 
         $client = new HttpClient($this->host);