Bug 1440693 - fix setting of host and port in mailnews/. r=aceman
--HG-- extra : rebase_source : 86de61daf833825dca9c5e78b8b8b1805920bafd
This commit is contained in:
Родитель
ed106687f7
Коммит
ad06da9886
|
@ -330,10 +330,15 @@ function onAccept()
|
|||
(secure.checked ? "ldaps://" : "ldap://") + "localhost/dc=???")
|
||||
.QueryInterface(Ci.nsILDAPURL);
|
||||
|
||||
ldapUrl.host = hostname;
|
||||
ldapUrl.port = port ? port :
|
||||
(secure.checked ? kDefaultSecureLDAPPort :
|
||||
kDefaultLDAPPort);
|
||||
let newPort = port ? port :
|
||||
(secure.checked ? kDefaultSecureLDAPPort :
|
||||
kDefaultLDAPPort);
|
||||
ldapUrl = ldapUrl.mutate()
|
||||
.setHost(hostname)
|
||||
.setPort(newPort)
|
||||
.finalize()
|
||||
.QueryInterface(Ci.nsILDAPURL);
|
||||
|
||||
ldapUrl.dn = document.getElementById("basedn").value;
|
||||
ldapUrl.scope = document.getElementById("one").selected ?
|
||||
Ci.nsILDAPURL.SCOPE_ONELEVEL :
|
||||
|
|
|
@ -36,7 +36,8 @@ var FeedCache =
|
|||
try
|
||||
{
|
||||
let normalizedUrl = Services.io.newURI(aUrl);
|
||||
normalizedUrl.host = normalizedUrl.host.toLowerCase();
|
||||
let newHost = host.toLowerCase();
|
||||
normalizedUrl = normalizedUrl.mutate().setHost(newHost).finalize();
|
||||
return normalizedUrl.spec
|
||||
}
|
||||
catch (ex)
|
||||
|
|
Загрузка…
Ссылка в новой задаче