bug 737155 - httpconnectionmgr::processPendingQ allow more than 1 with pipeline r=honzab

--HG--
extra : rebase_source : 94c50c125fc66c9d5b4389e20b0187ee40c2e315
This commit is contained in:
Patrick McManus 2012-03-20 13:11:32 -04:00
Родитель 28c3c87c12
Коммит cb1e7c1f50
1 изменённых файлов: 15 добавлений и 4 удалений

Просмотреть файл

@ -870,11 +870,14 @@ nsHttpConnectionMgr::ProcessPendingQForEntry(nsConnectionEntry *ent)
ProcessSpdyPendingQ(ent);
PRInt32 count = ent->mPendingQ.Length();
PRUint32 count = ent->mPendingQ.Length();
nsHttpTransaction *trans;
nsresult rv;
bool dispatchedSuccessfully = false;
for (PRInt32 i = 0; i < count; ++i) {
// iterate the pending list until one is dispatched successfully. Keep
// iterating afterwards only until a transaction fails to dispatch.
for (PRUint32 i = 0; i < count; ++i) {
trans = ent->mPendingQ[i];
// When this transaction has already established a half-open
@ -895,9 +898,17 @@ nsHttpConnectionMgr::ProcessPendingQForEntry(nsConnectionEntry *ent)
LOG((" dispatching pending transaction...\n"));
ent->mPendingQ.RemoveElementAt(i);
NS_RELEASE(trans);
return true;
// reset index and array length after RemoveElelmentAt()
dispatchedSuccessfully = true;
count = ent->mPendingQ.Length();
--i;
continue;
}
if (dispatchedSuccessfully)
return true;
NS_ABORT_IF_FALSE(count == ((PRInt32) ent->mPendingQ.Length()),
"something mutated pending queue from "
"GetConnection()");