summaryrefslogtreecommitdiffstats
path: root/netwerk/protocol/http/Http2Session.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/Http2Session.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/Http2Session.cpp')
-rw-r--r--netwerk/protocol/http/Http2Session.cpp24
1 files changed, 6 insertions, 18 deletions
diff --git a/netwerk/protocol/http/Http2Session.cpp b/netwerk/protocol/http/Http2Session.cpp
index 86e8c74f6..4a178f091 100644
--- a/netwerk/protocol/http/Http2Session.cpp
+++ b/netwerk/protocol/http/Http2Session.cpp
@@ -380,24 +380,12 @@ Http2Session::AddStream(nsAHttpTransaction *aHttpTransaction,
if (mClosed || mShouldGoAway) {
nsHttpTransaction *trans = aHttpTransaction->QueryHttpTransaction();
- if (trans) {
- RefPtr<Http2PushedStreamWrapper> pushedStreamWrapper;
- pushedStreamWrapper = trans->GetPushedStream();
- if (!pushedStreamWrapper || !pushedStreamWrapper->GetStream()) {
- LOG3(
- ("Http2Session::AddStream %p atrans=%p trans=%p session unusable - "
- "resched.\n", this, aHttpTransaction, trans));
- aHttpTransaction->SetConnection(nullptr);
- nsresult rv =
- gHttpHandler->InitiateTransaction(trans, trans->Priority());
- if (NS_FAILED(rv)) {
- LOG3(
- ("Http2Session::AddStream %p atrans=%p trans=%p failed to "
- "initiate transaction (%08x).\n",
- this, aHttpTransaction, trans, static_cast<uint32_t>(rv)));
- }
- return true;
- }
+ if (trans && !trans->GetPushedStream()) {
+ LOG3(("Http2Session::AddStream %p atrans=%p trans=%p session unusable - resched.\n",
+ this, aHttpTransaction, trans));
+ aHttpTransaction->SetConnection(nullptr);
+ gHttpHandler->InitiateTransaction(trans, trans->Priority());
+ return true;
}
}