OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

don't make HS ports explicit if it's the default for the protocol

paul/schema_breaking_changes
Matthew Hodgson 2014-08-31 15:38:27 +01:00
parent 2b7918bd6f
commit 7ca6d4e8f7
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webclient/login/login-controller.js
View File

@ -7,7 +7,10 @@ angular.module('LoginController', ['matrixService'])
// Assume that this is hosted on the home server, in which case the URL // Assume that this is hosted on the home server, in which case the URL
// contains the home server. // contains the home server.
var hs_url = $location.protocol() + "://" + $location.host(); var hs_url = $location.protocol() + "://" + $location.host();
if ($location.port()) { if ($location.port() &&
!($location.protocol() === "http" && $location.port() === 80) &&
!($location.protocol() === "https" && $location.port() === 443))
{
hs_url += ":" + $location.port(); hs_url += ":" + $location.port();
} }
var example_domain = $location.host(); var example_domain = $location.host();

5
webclient/login/register-controller.js
View File

@ -8,7 +8,10 @@ angular.module('RegisterController', ['matrixService'])
// Assume that this is hosted on the home server, in which case the URL // Assume that this is hosted on the home server, in which case the URL
// contains the home server. // contains the home server.
var hs_url = $location.protocol() + "://" + $location.host(); var hs_url = $location.protocol() + "://" + $location.host();
if ($location.port()) { if ($location.port() &&
!($location.protocol() === "http" && $location.port() === 80) &&
!($location.protocol() === "https" && $location.port() === 443))
{
hs_url += ":" + $location.port(); hs_url += ":" + $location.port();
} }