зеркало из https://github.com/mozilla/gecko-dev.git
bug 667387 - make nshttppipeline::taketransport() work with websockets r=honzab
This commit is contained in:
Родитель
7d79b1d10e
Коммит
789112cd4e
|
@ -113,6 +113,8 @@ nsHttpPipeline::~nsHttpPipeline()
|
|||
// make sure we aren't still holding onto any transactions!
|
||||
Close(NS_ERROR_ABORT);
|
||||
|
||||
NS_IF_RELEASE(mConnection);
|
||||
|
||||
if (mPushBackBuf)
|
||||
free(mPushBackBuf);
|
||||
}
|
||||
|
@ -125,7 +127,7 @@ nsHttpPipeline::AddTransaction(nsAHttpTransaction *trans)
|
|||
NS_ADDREF(trans);
|
||||
mRequestQ.AppendElement(trans);
|
||||
|
||||
if (mConnection) {
|
||||
if (mConnection && !mClosed) {
|
||||
trans->SetConnection(this);
|
||||
|
||||
if (mRequestQ.Length() == 1)
|
||||
|
@ -700,10 +702,6 @@ nsHttpPipeline::Close(nsresult reason)
|
|||
mResponseQ.Clear();
|
||||
}
|
||||
|
||||
// we must no longer reference the connection! This needs to come
|
||||
// after we've closed all our transactions, since they might want
|
||||
// connection info as they close.
|
||||
NS_IF_RELEASE(mConnection);
|
||||
}
|
||||
|
||||
nsresult
|
||||
|
|
Загрузка…
Ссылка в новой задаче