Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit 10bda29

Browse files
committed
Backed out 1 changesets (bug 1656697) for regressions. a=backout
Backed out changeset 005391f69f10 (bug 1656697)
1 parent 79954cb commit 10bda29

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

netwerk/protocol/http/Http2Session.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4039,9 +4039,8 @@ void Http2Session::CreateTunnel(nsHttpTransaction* trans,
40394039
// transaction so that an auth created by the connect can be mappped
40404040
// to the correct security callbacks
40414041

4042-
RefPtr<nsHttpConnectionInfo> clone(ci->Clone());
40434042
RefPtr<SpdyConnectTransaction> connectTrans = new SpdyConnectTransaction(
4044-
clone, aCallbacks, trans->Caps(), trans, this, false);
4043+
ci, aCallbacks, trans->Caps(), trans, this, false);
40454044
DebugOnly<bool> rv =
40464045
AddStream(connectTrans, nsISupportsPriority::PRIORITY_NORMAL, false,
40474046
false, nullptr);
@@ -4567,9 +4566,8 @@ void Http2Session::CreateWebsocketStream(
45674566
nsHttpConnectionInfo* ci = aOriginalTransaction->ConnectionInfo();
45684567
MOZ_ASSERT(ci);
45694568

4570-
RefPtr<nsHttpConnectionInfo> clone(ci->Clone());
45714569
RefPtr<SpdyConnectTransaction> connectTrans = new SpdyConnectTransaction(
4572-
clone, aCallbacks, trans->Caps(), trans, this, true);
4570+
ci, aCallbacks, trans->Caps(), trans, this, true);
45734571
DebugOnly<bool> rv =
45744572
AddStream(connectTrans, nsISupportsPriority::PRIORITY_NORMAL, false,
45754573
false, nullptr);

netwerk/protocol/http/nsHttpTransaction.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2094,9 +2094,9 @@ void nsHttpTransaction::ReleaseBlockingTransaction() {
20942094
void nsHttpTransaction::DisableSpdy() {
20952095
mCaps |= NS_HTTP_DISALLOW_SPDY;
20962096
if (mConnInfo) {
2097-
RefPtr<nsHttpConnectionInfo> connInfo = mConnInfo->Clone();
2098-
connInfo->SetNoSpdy(true);
2099-
mConnInfo.swap(connInfo);
2097+
// This is our clone of the connection info, not the persistent one that
2098+
// is owned by the connection manager, so we're safe to change this here
2099+
mConnInfo->SetNoSpdy(true);
21002100
}
21012101
}
21022102

0 commit comments

Comments
 (0)