wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Back out bug 628561 (d5fad1ab2f00) on suspicion of causing Tp regressions.

Browse Source
This commit is contained in:
Joe Drew 2011-03-24 20:30:59 -04:00
parent 0f83ac4e73
commit 1ba8c47fbd
4 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
netwerk/protocol/http/nsHttp.h
View File

@ -125,11 +125,6 @@ typedef PRUint8 nsHttpVersion;
// to the server (see bug #466080), but is may also be used for other things
#define NS_HTTP_LOAD_ANONYMOUS (1<<4)
// a transaction with this caps flag will not only not use an existing
// persistent connection but it will close outstanding ones to the same
// host. Used by a forced reload to reset the connection states.
#define NS_HTTP_CLEAR_KEEPALIVES (1<<5)
//-----------------------------------------------------------------------------
// some default values
//-----------------------------------------------------------------------------

4
netwerk/protocol/http/nsHttpChannel.cpp
View File

@ -3661,10 +3661,6 @@ nsHttpChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *context)
(BYPASS_LOCAL_CACHE(mLoadFlags)))
mCaps |= NS_HTTP_REFRESH_DNS;
// Force-Reload should reset the pconn pool for this host
if (mLoadFlags & LOAD_BYPASS_CACHE)
mCaps |= NS_HTTP_CLEAR_KEEPALIVES;
mIsPending = PR_TRUE;
mWasOpened = PR_TRUE;

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

@ -630,24 +630,6 @@ nsHttpConnectionMgr::AtActiveConnectionLimit(nsConnectionEntry *ent, PRUint8 cap
(persistCount >= maxPersistConns) );
}
void
nsHttpConnectionMgr::ClosePersistentConnections(nsConnectionEntry *ent)
{
LOG(("nsHttpConnectionMgr::ClosePersistentConnections [ci=%s]\n",
ent->mConnInfo->HashKey().get()));
while (ent->mIdleConns.Length()) {
nsHttpConnection *conn = ent->mIdleConns[0];
ent->mIdleConns.RemoveElementAt(0);
mNumIdleConns--;
conn->Close(NS_ERROR_ABORT);
NS_RELEASE(conn);
}
PRInt32 activeCount = ent->mActiveConns.Length();
for (PRInt32 i=0; i < activeCount; i++)
ent->mActiveConns[i]->DontReuse();
}
void
nsHttpConnectionMgr::GetConnection(nsConnectionEntry *ent, PRUint8 caps,
nsHttpConnection **result)
@ -838,11 +820,6 @@ nsHttpConnectionMgr::ProcessNewTransaction(nsHttpTransaction *trans)
mCT.Put(&key, ent);
}
// If we are doing a force reload then close out any existing conns
// to this host so that changes in DNS, LBs, etc.. are reflected
if (caps & NS_HTTP_CLEAR_KEEPALIVES)
ClosePersistentConnections(ent);
nsHttpConnection *conn;
// check if the transaction already has a sticky reference to a connection.

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

@ -218,7 +218,6 @@ private:
PRBool BuildPipeline(nsConnectionEntry *, nsAHttpTransaction *, nsHttpPipeline **);
nsresult ProcessNewTransaction(nsHttpTransaction *);
nsresult EnsureSocketThreadTargetIfOnline();
void ClosePersistentConnections(nsConnectionEntry *ent);
// message handlers have this signature
typedef void (nsHttpConnectionMgr:: *nsConnEventHandler)(PRInt32, void *);