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

merge

Browse Source
This commit is contained in:
Honza Bambas 2013-01-29 22:27:43 +01:00
commit 03846d1fe6
7 changed files with 11 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netwerk/base/public/nsISocketTransport.idl
View File

@ -163,12 +163,6 @@ interface nsISocketTransport : nsITransport
*/
const unsigned long NO_PERMANENT_STORAGE = (1 << 3);
/**
* If set, we will skip all IPv4 addresses the host may have and only
* connect to IPv6 ones.
*/
const unsigned long DISABLE_IPV4 = (1 << 4);
/**
* Socket QoS/ToS markings. Valid values are IPTOS_DSCP_AFxx or
* IPTOS_CLASS_CSx (or IPTOS_DSCP_EF, but currently no supported

19
netwerk/base/src/nsSocketTransport2.cpp
View File

@ -926,12 +926,6 @@ nsSocketTransport::ResolveHost()
dnsFlags = nsIDNSService::RESOLVE_BYPASS_CACHE;
if (mConnectionFlags & nsSocketTransport::DISABLE_IPV6)
dnsFlags |= nsIDNSService::RESOLVE_DISABLE_IPV6;
if (mConnectionFlags & nsSocketTransport::DISABLE_IPV4)
dnsFlags |= nsIDNSService::RESOLVE_DISABLE_IPV4;
NS_ASSERTION(!(dnsFlags & nsIDNSService::RESOLVE_DISABLE_IPV6) ||
!(dnsFlags & nsIDNSService::RESOLVE_DISABLE_IPV4),
"Setting both RESOLVE_DISABLE_IPV6 and RESOLVE_DISABLE_IPV4");
SendStatus(NS_NET_STATUS_RESOLVING_HOST);
rv = dns->AsyncResolve(SocketHost(), dnsFlags, this, nullptr,
@ -1273,12 +1267,12 @@ nsSocketTransport::RecoverFromError()
bool tryAgain = false;
if (mConnectionFlags & (DISABLE_IPV6 | DISABLE_IPV4) &&
if (mConnectionFlags & DISABLE_IPV6 &&
mCondition == NS_ERROR_UNKNOWN_HOST &&
mState == STATE_RESOLVING &&
!mProxyTransparentResolvesHost) {
SOCKET_LOG((" trying lookup again with both ipv4/ipv6 enabled\n"));
mConnectionFlags &= ~(DISABLE_IPV6 | DISABLE_IPV4);
mConnectionFlags &= ~DISABLE_IPV6;
tryAgain = true;
}
@ -1291,15 +1285,14 @@ nsSocketTransport::RecoverFromError()
SOCKET_LOG((" trying again with next ip address\n"));
tryAgain = true;
}
else if (mConnectionFlags & (DISABLE_IPV6 | DISABLE_IPV4)) {
else if (mConnectionFlags & DISABLE_IPV6) {
// Drop state to closed. This will trigger new round of DNS
// resolving bellow.
// XXX Could be optimized to only switch the flags to save duplicate
// connection attempts.
SOCKET_LOG((" failed to connect all ipv4-only or ipv6-only hosts,"
// XXX Here should idealy be set now non-existing flag DISABLE_IPV4
SOCKET_LOG((" failed to connect all ipv4 hosts,"
" trying lookup/connect again with both ipv4/ipv6\n"));
mState = STATE_CLOSED;
mConnectionFlags &= ~(DISABLE_IPV6 | DISABLE_IPV4);
mConnectionFlags &= ~DISABLE_IPV6;
tryAgain = true;
}
}

3
netwerk/dns/nsDNSService2.cpp
View File

@ -850,9 +850,6 @@ nsDNSService::GetAFForLookup(const nsACString &host, uint32_t flags)
} while (*end);
}
if ((af != PR_AF_INET) && (flags & RESOLVE_DISABLE_IPV4))
af = PR_AF_INET6;
return af;
}

5
netwerk/dns/nsIDNSService.idl
View File

@ -134,9 +134,4 @@ interface nsIDNSService : nsISupports
* asyncResolve.
*/
const unsigned long RESOLVE_OFFLINE = (1 << 6);
/**
* If set, only IPv6 addresses will be returned from resolve/asyncResolve.
*/
const unsigned long RESOLVE_DISABLE_IPV4 = (1 << 7);
};

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

@ -4484,10 +4484,8 @@ nsHttpChannel::BeginConnect()
// Force-Reload should reset the persistent connection pool for this host
if (mLoadFlags & LOAD_FRESH_CONNECTION) {
// just the initial document resets the whole pool
if (mLoadFlags & LOAD_INITIAL_DOCUMENT_URI) {
if (mLoadFlags & LOAD_INITIAL_DOCUMENT_URI)
gHttpHandler->ConnMgr()->ClosePersistentConnections();
gHttpHandler->ConnMgr()->ResetIPFamillyPreference(mConnectionInfo);
}
// each sub resource gets a fresh connection
mCaps &= ~(NS_HTTP_ALLOW_KEEPALIVE | NS_HTTP_ALLOW_PIPELINING);
}

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

@ -2521,13 +2521,8 @@ nsHalfOpenSocket::SetupStreams(nsISocketTransport **transport,
// IPv6 on the backup connection gives them a much better user experience
// with dual-stack hosts, though they still pay the 250ms delay for each new
// connection. This strategy is also known as "happy eyeballs".
if (mEnt->mPreferIPv6) {
tmpFlags |= nsISocketTransport::DISABLE_IPV4;
}
else if (mEnt->mPreferIPv4 ||
(isBackup && gHttpHandler->FastFallbackToIPv4())) {
if (isBackup && gHttpHandler->FastFallbackToIPv4())
tmpFlags |= nsISocketTransport::DISABLE_IPV6;
}
socketTransport->SetConnectionFlags(tmpFlags);
@ -2719,7 +2714,6 @@ nsHalfOpenSocket::OnOutputStreamReady(nsIAsyncOutputStream *out)
LOG(("nsHalfOpenSocket::OnOutputStreamReady "
"Created new nshttpconnection %p\n", conn.get()));
PRNetAddr peeraddr;
nsCOMPtr<nsIInterfaceRequestor> callbacks;
mTransaction->GetSecurityCallbacks(getter_AddRefs(callbacks));
if (out == mStreamOut) {
@ -2730,9 +2724,6 @@ nsHalfOpenSocket::OnOutputStreamReady(nsIAsyncOutputStream *out)
callbacks,
PR_MillisecondsToInterval(rtt.ToMilliseconds()));
if (NS_SUCCEEDED(mSocketTransport->GetPeerAddr(&peeraddr)))
mEnt->RecordIPFamilyPreference(peeraddr.raw.family);
// The nsHttpConnection object now owns these streams and sockets
mStreamOut = nullptr;
mStreamIn = nullptr;
@ -2746,9 +2737,6 @@ nsHalfOpenSocket::OnOutputStreamReady(nsIAsyncOutputStream *out)
callbacks,
PR_MillisecondsToInterval(rtt.ToMilliseconds()));
if (NS_SUCCEEDED(mBackupTransport->GetPeerAddr(&peeraddr)))
mEnt->RecordIPFamilyPreference(peeraddr.raw.family);
// The nsHttpConnection object now owns these streams and sockets
mBackupStreamOut = nullptr;
mBackupStreamIn = nullptr;
@ -2961,8 +2949,6 @@ nsConnectionEntry::nsConnectionEntry(nsHttpConnectionInfo *ci)
, mUsingSpdy(false)
, mTestedSpdy(false)
, mSpdyPreferred(false)
, mPreferIPv4(false)
, mPreferIPv6(false)
{
NS_ADDREF(mConnInfo);
if (gHttpHandler->GetPipelineAggressive()) {
@ -3118,8 +3104,7 @@ nsConnectionEntry::SetYellowConnection(nsHttpConnection *conn)
}
void
nsHttpConnectionMgr::
nsConnectionEntry::OnYellowComplete()
nsHttpConnectionMgr::nsConnectionEntry::OnYellowComplete()
{
if (mPipelineState == PS_YELLOW) {
if (mYellowGoodEvents && !mYellowBadEvents) {
@ -3142,8 +3127,7 @@ nsConnectionEntry::OnYellowComplete()
}
void
nsHttpConnectionMgr::
nsConnectionEntry::CreditPenalty()
nsHttpConnectionMgr::nsConnectionEntry::CreditPenalty()
{
if (mLastCreditTime.IsNull())
return;
@ -3239,17 +3223,8 @@ nsHttpConnectionMgr::GetConnectionData(nsTArray<mozilla::net::HttpRetParams> *aA
return true;
}
void
nsHttpConnectionMgr::ResetIPFamillyPreference(nsHttpConnectionInfo *ci)
{
nsConnectionEntry *ent = LookupConnectionEntry(ci, nullptr, nullptr);
if (ent)
ent->ResetIPFamilyPreference();
}
uint32_t
nsHttpConnectionMgr::
nsConnectionEntry::UnconnectedHalfOpens()
nsHttpConnectionMgr::nsConnectionEntry::UnconnectedHalfOpens()
{
uint32_t unconnectedHalfOpens = 0;
for (uint32_t i = 0; i < mHalfOpens.Length(); ++i) {
@ -3275,22 +3250,3 @@ nsConnectionEntry::RemoveHalfOpen(nsHalfOpenSocket *halfOpen)
// altering the pending q vector from an arbitrary stack
gHttpHandler->ConnMgr()->ProcessPendingQ(mConnInfo);
}
void
nsHttpConnectionMgr::
nsConnectionEntry::RecordIPFamilyPreference(uint16_t family)
{
if (family == PR_AF_INET && !mPreferIPv6)
mPreferIPv4 = true;
if (family == PR_AF_INET6 && !mPreferIPv4)
mPreferIPv6 = true;
}
void
nsHttpConnectionMgr::
nsConnectionEntry::ResetIPFamilyPreference()
{
mPreferIPv4 = false;
mPreferIPv6 = false;
}

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

@ -225,9 +225,6 @@ public:
bool SupportsPipelining(nsHttpConnectionInfo *);
bool GetConnectionData(nsTArray<mozilla::net::HttpRetParams> *);
void ResetIPFamillyPreference(nsHttpConnectionInfo *);
private:
virtual ~nsHttpConnectionMgr();
@ -346,20 +343,6 @@ private:
bool mTestedSpdy;
bool mSpdyPreferred;
// Flags to remember our happy-eyeballs decision.
// Reset only by Ctrl-F5 reload.
// True when we've first connected an IPv4 server for this host,
// initially false.
bool mPreferIPv4 : 1;
// True when we've first connected an IPv6 server for this host,
// initially false.
bool mPreferIPv6 : 1;
// Set the IP family preference flags according the connected family
void RecordIPFamilyPreference(uint16_t family);
// Resets all flags to their default values
void ResetIPFamilyPreference();
};
// nsConnectionHandle