Bug 1253358 - minor h2 push fixes r=hurley

This commit is contained in:
Patrick McManus 2016-03-03 11:48:30 -05:00
parent 1e100d5284
commit 88c9df9cd6
3 changed files with 6 additions and 2 deletions

View File

@ -1658,6 +1658,7 @@ Http2Session::RecvPushPromise(Http2Session *self)
LOG3(("Http2Session::PushPromise Semantics not Implemented\n"));
self->GenerateRstStream(REFUSED_STREAM_ERROR, promisedID);
delete pushedStream;
self->ResetDownstreamState();
return NS_OK;
}
@ -1666,6 +1667,7 @@ Http2Session::RecvPushPromise(Http2Session *self)
// the decoded headers. Reset the stream and go away.
self->GenerateRstStream(PROTOCOL_ERROR, promisedID);
delete pushedStream;
self->ResetDownstreamState();
return NS_OK;
} else if (NS_FAILED(rv)) {
// This is fatal to the session.

View File

@ -1064,7 +1064,9 @@ Http2Stream::ConvertPushHeaders(Http2Decompressor *decompressor,
}
aHeadersIn.Truncate();
LOG (("decoded push headers are:\n%s", aHeadersOut.BeginReading()));
LOG (("id 0x%X decoded push headers %s %s %s are:\n%s", mStreamID,
mHeaderScheme.get(), mHeaderHost.get(), mHeaderPath.get(),
aHeadersOut.BeginReading()));
return NS_OK;
}

View File

@ -351,7 +351,7 @@ nsresult
nsHttpConnection::Activate(nsAHttpTransaction *trans, uint32_t caps, int32_t pri)
{
MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread);
LOG(("nsHttpConnection::Activate [this=%p trans=%x caps=%x]\n",
LOG(("nsHttpConnection::Activate [this=%p trans=%p caps=%x]\n",
this, trans, caps));
if (!trans->IsNullTransaction())