summaryrefslogtreecommitdiffstats
path: root/netwerk/protocol/http/nsHttpConnectionMgr.cpp
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-07-21 21:30:26 +0200
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-07-21 21:31:04 +0200
commit91de3341df7e08094e17a34053b8e21c89ab02a7 (patch)
treefafc6b9475618a2055e627d0f5a68593ee11eb4f /netwerk/protocol/http/nsHttpConnectionMgr.cpp
parent1dbed95e4c43fdbcc2d959ddb06ebe6331afb9d8 (diff)
downloadUXP-91de3341df7e08094e17a34053b8e21c89ab02a7.tar
UXP-91de3341df7e08094e17a34053b8e21c89ab02a7.tar.gz
UXP-91de3341df7e08094e17a34053b8e21c89ab02a7.tar.lz
UXP-91de3341df7e08094e17a34053b8e21c89ab02a7.tar.xz
UXP-91de3341df7e08094e17a34053b8e21c89ab02a7.zip
Revert "Implement a threadsafe & revised version of http2PushedStream."
Backed out because of gcc build failures. This reverts commit 66fae1d81013a2321e7d607a426f834a01b847ce.
Diffstat (limited to 'netwerk/protocol/http/nsHttpConnectionMgr.cpp')
-rw-r--r--netwerk/protocol/http/nsHttpConnectionMgr.cpp19
1 files changed, 7 insertions, 12 deletions
diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp
index d402b4104..71c19a9ec 100644
--- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp
+++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp
@@ -1827,18 +1827,13 @@ nsHttpConnectionMgr::ProcessNewTransaction(nsHttpTransaction *trans)
trans->SetPendingTime();
- RefPtr<Http2PushedStreamWrapper> pushedStreamWrapper =
- trans->GetPushedStream();
- if (pushedStreamWrapper) {
- Http2PushedStream* pushedStream = pushedStreamWrapper->GetStream();
- if (pushedStream) {
- LOG((" ProcessNewTransaction %p tied to h2 session push %p\n", trans,
- pushedStream->Session()));
- return pushedStream->Session()->AddStream(trans, trans->Priority(), false,
- nullptr)
- ? NS_OK
- : NS_ERROR_UNEXPECTED;
- }
+ Http2PushedStream *pushedStream = trans->GetPushedStream();
+ if (pushedStream) {
+ LOG((" ProcessNewTransaction %p tied to h2 session push %p\n",
+ trans, pushedStream->Session()));
+ return pushedStream->Session()->
+ AddStream(trans, trans->Priority(), false, nullptr) ?
+ NS_OK : NS_ERROR_UNEXPECTED;
}
nsresult rv = NS_OK;