mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
import changes from `dev' branch of rmottola/Arctic-Fox:
- Bug 1228822 - Ensure we send out the window update when matching a pushed stream with a pull stream. r=mcmanus (0ced75ca0c) - Bug 1234591 - Use channel.asyncOpen2 within netwerk/test/unit/test_http2.js r=ckerschb (c9369b0517) - Bug 1249379 - H2 Push WindowUpdate not written to network r=hurley (8dec8b4c4a) - Bug 1249432 - less h2 parallel conns r=hurley (b2a6eeeac4) - Bug 1209184: Part 2 - [webext] Localize CSS files served from moz-extension: channels. r=jdm (1098b41a0d) - Bug 1242961 - nsStandardURL still allows to build valid nsIURIs longer than network.standard-url.max-length. r=valentin (f768b36113)
This commit is contained in:
@@ -39,6 +39,8 @@ Http2Stream::Http2Stream(nsAHttpTransaction *httpTransaction,
|
||||
int32_t priority)
|
||||
: mStreamID(0)
|
||||
, mSession(session)
|
||||
, mSegmentReader(nullptr)
|
||||
, mSegmentWriter(nullptr)
|
||||
, mUpstreamState(GENERATING_HEADERS)
|
||||
, mState(IDLE)
|
||||
, mRequestHeadersDone(0)
|
||||
@@ -47,8 +49,6 @@ Http2Stream::Http2Stream(nsAHttpTransaction *httpTransaction,
|
||||
, mQueued(0)
|
||||
, mTransaction(httpTransaction)
|
||||
, mSocketTransport(session->SocketTransport())
|
||||
, mSegmentReader(nullptr)
|
||||
, mSegmentWriter(nullptr)
|
||||
, mChunkSize(session->SendingChunkSize())
|
||||
, mRequestBlockedOnRead(0)
|
||||
, mRecvdFin(0)
|
||||
@@ -486,8 +486,8 @@ Http2Stream::ParseHttpRequestHeaders(const char *buf,
|
||||
mSession, hashkey.get(), schedulingContext, cache, pushedStream));
|
||||
|
||||
if (pushedStream) {
|
||||
LOG3(("Pushed Stream Match located id=0x%X key=%s\n",
|
||||
pushedStream->StreamID(), hashkey.get()));
|
||||
LOG3(("Pushed Stream Match located %p id=0x%X key=%s\n",
|
||||
pushedStream, pushedStream->StreamID(), hashkey.get()));
|
||||
pushedStream->SetConsumerStream(this);
|
||||
mPushSource = pushedStream;
|
||||
SetSentFin(true);
|
||||
@@ -1387,6 +1387,11 @@ Http2Stream::OnReadSegment(const char *buf,
|
||||
MOZ_ASSERT(false, "resuming partial fin stream out of OnReadSegment");
|
||||
break;
|
||||
|
||||
case UPSTREAM_COMPLETE:
|
||||
MOZ_ASSERT(mPushSource);
|
||||
rv = TransmitFrame(nullptr, nullptr, true);
|
||||
break;
|
||||
|
||||
default:
|
||||
MOZ_ASSERT(false, "Http2Stream::OnReadSegment non-write state");
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user