зеркало из https://github.com/mozilla/pjs.git
Fix for bug 74488 (and hopefully bug 74552): app freezes in mail when psm dialog is brought up (/ a link is clicked), r=scc, sr=darin
This commit is contained in:
Родитель
0b39ea3eb1
Коммит
9394feaaff
|
@ -3304,16 +3304,9 @@ nsHTTPChannel::SetReferrer(nsIURI *referrer, PRUint32 referrerLevel)
|
||||||
nsCAutoString ref(spec.get());
|
nsCAutoString ref(spec.get());
|
||||||
nsXPIDLCString prehost;
|
nsXPIDLCString prehost;
|
||||||
referrer->GetPreHost(getter_Copies(prehost));
|
referrer->GetPreHost(getter_Copies(prehost));
|
||||||
if (prehost.get()) {
|
if (prehost && *prehost) {
|
||||||
PRUint32 prehostLocation = ref.Find(prehost.get(), PR_TRUE);
|
PRUint32 prehostLocation = PRUint32(ref.Find(prehost, PR_TRUE));
|
||||||
PRInt32 remainingStart = prehostLocation +
|
ref.Cut(prehostLocation, nsCharTraits<char>::length(prehost) + 1); // + 1 for @
|
||||||
PL_strlen(prehost.get()) + 1; // 1 for @
|
|
||||||
ref = Substring(NS_READABLE_CAST(char, ref),
|
|
||||||
(PRUint32) 0,
|
|
||||||
(PRUint32) prehostLocation) +
|
|
||||||
Substring(NS_READABLE_CAST(char, ref),
|
|
||||||
(PRUint32) remainingStart,
|
|
||||||
(PRUint32) ref.Length()-remainingStart);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((referrerLevel == nsIHTTPChannel::REFERRER_NON_HTTP) ||
|
if ((referrerLevel == nsIHTTPChannel::REFERRER_NON_HTTP) ||
|
||||||
|
|
Загрузка…
Ссылка в новой задаче