bug 1003935 - call dontreuse() on reclaimed conns with transaction refs r=sworkman

This commit is contained in:
Patrick McManus 2014-04-30 13:15:46 -04:00
Родитель 437ea5c26f
Коммит 1366b6fd61
2 изменённых файлов: 11 добавлений и 1 удалений

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

@ -2366,6 +2366,13 @@ nsHttpConnectionMgr::OnMsgReclaimConnection(int32_t, void *param)
ConditionallyStopTimeoutTick(); ConditionallyStopTimeoutTick();
} }
// a connection that still holds a reference to a transaction was
// not closed naturally (i.e. it was reset or aborted) and is
// therefore not something that should be reused.
if (conn->Transaction()) {
conn->DontReuse();
}
if (conn->CanReuse()) { if (conn->CanReuse()) {
LOG((" adding connection to idle list\n")); LOG((" adding connection to idle list\n"));
// Keep The idle connection list sorted with the connections that // Keep The idle connection list sorted with the connections that

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

@ -1066,7 +1066,10 @@ nsHttpTransaction::Restart()
// clear old connection state... // clear old connection state...
mSecurityInfo = 0; mSecurityInfo = 0;
NS_IF_RELEASE(mConnection); if (mConnection) {
mConnection->DontReuse();
NS_RELEASE(mConnection);
}
// disable pipelining for the next attempt in case pipelining caused the // disable pipelining for the next attempt in case pipelining caused the
// reset. this is being overly cautious since we don't know if pipelining // reset. this is being overly cautious since we don't know if pipelining