Bug 767512 - Fix connection pressure for non-SSL CONNECT. r=mcmanus

This commit is contained in:
Jason Duell 2012-06-22 12:01:00 -07:00
parent 7282eef996
commit 00c8919da9

View File

@ -1379,7 +1379,7 @@ nsHttpConnectionMgr::IsUnderPressure(nsConnectionEntry *ent,
// favor existing pipelines over more parallelism so as to reserve any
// unused parallel connections for types that don't have existing pipelines.
//
// The defintion of connection pressure is a pretty liberal one here - that
// The definition of connection pressure is a pretty liberal one here - that
// is why we are using the more restrictive maxPersist* counters.
//
// Pipelines are also favored when the requested classification is already
@ -1389,7 +1389,7 @@ nsHttpConnectionMgr::IsUnderPressure(nsConnectionEntry *ent,
PRInt32 currentConns = ent->mActiveConns.Length();
PRInt32 maxConns =
(ent->mConnInfo->UsingHttpProxy() && !ent->mConnInfo->UsingSSL()) ?
(ent->mConnInfo->UsingHttpProxy() && !ent->mConnInfo->UsingConnect()) ?
mMaxPersistConnsPerProxy : mMaxPersistConnsPerHost;
// Leave room for at least 3 distinct types to operate concurrently,