зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset d83e597679f5 (bug 1147990
)
This commit is contained in:
Родитель
db397cc487
Коммит
c59011f4dc
|
@ -1927,10 +1927,11 @@ WebSocketImpl::ParseURL(const nsAString& aURL)
|
|||
}
|
||||
}
|
||||
|
||||
mWebSocket->mOriginalURL = aURL;
|
||||
|
||||
rv = parsedURL->GetSpec(mURI);
|
||||
MOZ_ASSERT(NS_SUCCEEDED(rv));
|
||||
|
||||
CopyUTF8toUTF16(mURI, mWebSocket->mURI);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
@ -2189,7 +2190,7 @@ WebSocket::GetUrl(nsAString& aURL)
|
|||
AssertIsOnTargetThread();
|
||||
|
||||
if (mEffectiveURL.IsEmpty()) {
|
||||
aURL = mURI;
|
||||
aURL = mOriginalURL;
|
||||
} else {
|
||||
aURL = mEffectiveURL;
|
||||
}
|
||||
|
@ -2416,7 +2417,7 @@ WebSocketImpl::GetName(nsACString& aName)
|
|||
{
|
||||
AssertIsOnMainThread();
|
||||
|
||||
CopyUTF16toUTF8(mWebSocket->mURI, aName);
|
||||
CopyUTF16toUTF8(mWebSocket->mOriginalURL, aName);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
|
|
@ -181,7 +181,7 @@ private:
|
|||
uint32_t mOutgoingBufferedAmount;
|
||||
|
||||
// related to the WebSocket constructor steps
|
||||
nsString mURI;
|
||||
nsString mOriginalURL;
|
||||
nsString mEffectiveURL; // after redirects
|
||||
nsCString mEstablishedExtensions;
|
||||
nsCString mEstablishedProtocol;
|
||||
|
|
Загрузка…
Ссылка в новой задаче