diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-08-25 12:24:46 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-08-25 12:24:46 -0400 |
| commit | b4ee26373042d2c5ab422a4955022fb278cb8fa1 (patch) | |
| tree | b1c2200c90e129a0bf975b000f027597db02f7df /web/react | |
| parent | 70da0dbec6ed35cfc3196d50db4209378549fd92 (diff) | |
| parent | ec1fbeb1a5bf27c2411428cd33bd16dfe73b50a3 (diff) | |
| download | chat-b4ee26373042d2c5ab422a4955022fb278cb8fa1.tar.gz chat-b4ee26373042d2c5ab422a4955022fb278cb8fa1.tar.bz2 chat-b4ee26373042d2c5ab422a4955022fb278cb8fa1.zip | |
Merge pull request #467 from mattermost/mm-2021
Fixes mm-2021 removes hard coded port for SSL
Diffstat (limited to 'web/react')
| -rw-r--r-- | web/react/stores/socket_store.jsx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/web/react/stores/socket_store.jsx b/web/react/stores/socket_store.jsx index c3c331828..e43a8f2be 100644 --- a/web/react/stores/socket_store.jsx +++ b/web/react/stores/socket_store.jsx @@ -25,12 +25,10 @@ var SocketStore = assign({}, EventEmitter.prototype, { if (window.WebSocket && !conn) { var protocol = 'ws://'; - var port = ''; if (window.location.protocol === 'https:') { protocol = 'wss://'; - port = ':8443'; } - var connUrl = protocol + location.host + port + '/api/v1/websocket'; + var connUrl = protocol + location.host + '/api/v1/websocket'; console.log('connecting to ' + connUrl); conn = new WebSocket(connUrl); |