diff options
| author | sergeyu <sergeyu@chromium.org> | 2015-03-17 18:16:25 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-18 01:17:09 +0000 |
| commit | 0c619881fcd09e4d17b70b11c353b3d5e5af144b (patch) | |
| tree | 816502b4581d11ad1e8ddd08dc8a2e25437ca811 /remoting/signaling | |
| parent | d46a7acfa02865f2ed8e5ff3aefa34a5263384e9 (diff) | |
| download | chromium_src-0c619881fcd09e4d17b70b11c353b3d5e5af144b.zip chromium_src-0c619881fcd09e4d17b70b11c353b3d5e5af144b.tar.gz chromium_src-0c619881fcd09e4d17b70b11c353b3d5e5af144b.tar.bz2 | |
Use port 5222 for XMPP connection from Me2Me host.
Connection on port 443 may be redirected through proxy. Proxied connections do not work in the service process
(see bug 467960). This is a temporary workaround for that
issue.
BUG=464044,467960
Review URL: https://codereview.chromium.org/1015853002
Cr-Commit-Position: refs/heads/master@{#321042}
Diffstat (limited to 'remoting/signaling')
| -rw-r--r-- | remoting/signaling/xmpp_signal_strategy.cc | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/remoting/signaling/xmpp_signal_strategy.cc b/remoting/signaling/xmpp_signal_strategy.cc index 92c0db5..b461266 100644 --- a/remoting/signaling/xmpp_signal_strategy.cc +++ b/remoting/signaling/xmpp_signal_strategy.cc @@ -140,26 +140,6 @@ XmppSignalStrategy::Core::Core( // Non-secure connections are allowed only for debugging. CHECK(xmpp_server_config_.use_tls); #endif - - // TODO(sergeyu): Support for direct connections without TLS is not - // implemented yet. - if (!xmpp_server_config_.use_tls) - NOTIMPLEMENTED(); - - // Port 5222 may be blocked by firewall. talk.google.com allows connections on - // port 443 which can be used instead of 5222. The webapp still requests to - // use port 5222 for backwards compatibility with older versions of the host - // that do not pass correct |use_fake_ssl_client_socket| value to - // XmppClientSocketFactory (and so cannot connect to port 443). In case we are - // connecting to talk.google.com try to use port 443 anyway. - // - // TODO(sergeyu): Once all hosts support connections on port 443 - // the webapp needs to be updated to request port 443 and these 2 lines can be - // removed. crbug.com/443384 - if (xmpp_server_config_.host == "talk.google.com" && - xmpp_server_config_.port == kDefaultXmppPort) { - xmpp_server_config_.port = kDefaultHttpsPort; - } } XmppSignalStrategy::Core::~Core() { |