diff options
| author | Nicholas Hurley <hurley@mozilla.com> | 2018-02-02 11:03:08 -0800 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-03-14 10:59:09 +0100 |
| commit | 756fb3e1455cd903f952ded1c45f86e3527875ed (patch) | |
| tree | 809988a6da3f108ee55472b4fb8597d13c560f30 /netwerk/protocol/http/Http2Session.cpp | |
| parent | e749d23a34ff04c492bcf729e01ed1a0292408f1 (diff) | |
| download | UXP-756fb3e1455cd903f952ded1c45f86e3527875ed.tar UXP-756fb3e1455cd903f952ded1c45f86e3527875ed.tar.gz UXP-756fb3e1455cd903f952ded1c45f86e3527875ed.tar.lz UXP-756fb3e1455cd903f952ded1c45f86e3527875ed.tar.xz UXP-756fb3e1455cd903f952ded1c45f86e3527875ed.zip | |
Bug 1416529. r=mcmanus, a=ritu
MozReview-Commit-ID: CD1l5vLB4yy
--HG--
extra : rebase_source : d74f8ca96dab4e0d25d79948fcddbf8dab98bb36
Diffstat (limited to 'netwerk/protocol/http/Http2Session.cpp')
| -rw-r--r-- | netwerk/protocol/http/Http2Session.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/netwerk/protocol/http/Http2Session.cpp b/netwerk/protocol/http/Http2Session.cpp index 55ddbe908..4f350af83 100644 --- a/netwerk/protocol/http/Http2Session.cpp +++ b/netwerk/protocol/http/Http2Session.cpp @@ -1044,6 +1044,15 @@ Http2Session::CleanupStream(Http2Stream *aStream, nsresult aResult, return; } + Http2PushedStream *pushSource = aStream->PushSource(); + if (pushSource) { + // aStream is a synthetic attached to an even push + MOZ_ASSERT(pushSource->GetConsumerStream() == aStream); + MOZ_ASSERT(!aStream->StreamID()); + MOZ_ASSERT(!(pushSource->StreamID() & 0x1)); + aStream->ClearPushSource(); + } + if (aStream->DeferCleanup(aResult)) { LOG3(("Http2Session::CleanupStream 0x%X deferred\n", aStream->StreamID())); return; @@ -1054,15 +1063,6 @@ Http2Session::CleanupStream(Http2Stream *aStream, nsresult aResult, return; } - Http2PushedStream *pushSource = aStream->PushSource(); - if (pushSource) { - // aStream is a synthetic attached to an even push - MOZ_ASSERT(pushSource->GetConsumerStream() == aStream); - MOZ_ASSERT(!aStream->StreamID()); - MOZ_ASSERT(!(pushSource->StreamID() & 0x1)); - pushSource->SetConsumerStream(nullptr); - } - // don't reset a stream that has recevied a fin or rst if (!aStream->RecvdFin() && !aStream->RecvdReset() && aStream->StreamID() && !(mInputFrameFinal && (aStream == mInputFrameDataStream))) { // !(recvdfin with mark pending) |