Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 23:31:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge m-c to inbound

Browse Source
This commit is contained in:
Ryan VanderMeulen 2012-05-15 19:24:50 -04:00
commit d0d422a19f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
netwerk/protocol/http/nsHttpConnection.h
View File

@ -165,6 +165,7 @@ public:
void EndIdleMonitoring();
bool UsingSpdy() { return mUsingSpdy; }
bool EverUsedSpdy() { return mEverUsedSpdy; }
// true when connection SSL NPN phase is complete and we know
// authoritatively whether UsingSpdy() or not.

2
netwerk/protocol/http/nsHttpConnectionMgr.cpp
View File

@ -1212,7 +1212,7 @@ nsHttpConnectionMgr::RestrictConnections(nsConnectionEntry *ent)
bool confirmedRestrict = false;
for (PRUint32 index = 0; index < ent->mActiveConns.Length(); ++index) {
nsHttpConnection *conn = ent->mActiveConns[index];
if (!conn->ReportedNPN() || conn->CanDirectlyActivate()) {
if (!conn->ReportedNPN() || conn->EverUsedSpdy()) {
confirmedRestrict = true;
break;
}