зеркало из https://github.com/mozilla/pjs.git
Don't return an async proxied object when the socket transport is asked for its ProgressEventSink. r=dougt, sr=shaver.
This commit is contained in:
Родитель
e23ce861b0
Коммит
f4f5ae3edd
|
@ -1161,15 +1161,17 @@ NS_IMETHODIMP
|
|||
nsSocketTransport::GetProgressEventSink(nsIProgressEventSink **aResult)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(aResult);
|
||||
NS_ADDREF(*aResult = mEventSink);
|
||||
*aResult = mNonProxiedEventSink;
|
||||
NS_IF_ADDREF(*aResult);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsSocketTransport::SetProgressEventSink(nsIProgressEventSink *aEventSink)
|
||||
{
|
||||
mEventSink = nsnull;
|
||||
mEventSink = mNonProxiedEventSink = 0;
|
||||
if (aEventSink) {
|
||||
mNonProxiedEventSink = aEventSink;
|
||||
nsresult rv;
|
||||
// Now generate a proxied event sink-
|
||||
NS_WITH_SERVICE(nsIProxyObjectManager,
|
||||
|
|
|
@ -216,6 +216,7 @@ protected:
|
|||
nsSocketState mCurrentState;
|
||||
nsCOMPtr<nsIRequest> mDNSRequest;
|
||||
nsCOMPtr<nsIProgressEventSink> mEventSink;
|
||||
nsCOMPtr<nsIProgressEventSink> mNonProxiedEventSink;
|
||||
char* mHostName;
|
||||
PRInt32 mPort;
|
||||
PRIntervalTime mLastActiveTime;
|
||||
|
|
Загрузка…
Ссылка в новой задаче