Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(366)

Unified Diff: net/spdy/spdy_framer.cc

Issue 754433003: Update from https://crrev.com/305340 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/spdy/hpack_huffman_aggregator.cc ('k') | net/spdy/spdy_framer_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_framer.cc
diff --git a/net/spdy/spdy_framer.cc b/net/spdy/spdy_framer.cc
index c08b59763323e33f5a2e3a8e8cc349252aecd282..f1b1de3d1396c7204bf870e220e325ffa9f06a9a 100644
--- a/net/spdy/spdy_framer.cc
+++ b/net/spdy/spdy_framer.cc
@@ -1991,7 +1991,8 @@ size_t SpdyFramer::ProcessRstStreamFramePayload(const char* data, size_t len) {
DCHECK(successful_read);
if (SpdyConstants::IsValidRstStreamStatus(protocol_version(),
status_raw)) {
- status = static_cast<SpdyRstStreamStatus>(status_raw);
+ status =
+ SpdyConstants::ParseRstStreamStatus(protocol_version(), status_raw);
} else {
if (protocol_version() > SPDY3) {
// Treat unrecognized status codes as INTERNAL_ERROR as
@@ -2484,7 +2485,8 @@ SpdySerializedFrame* SpdyFramer::SerializeRstStream(
builder.BeginNewFrame(*this, RST_STREAM, 0, rst_stream.stream_id());
}
- builder.WriteUInt32(rst_stream.status());
+ builder.WriteUInt32(SpdyConstants::SerializeRstStreamStatus(
+ protocol_version(), rst_stream.status()));
// In SPDY4 and up, RST_STREAM frames may also specify opaque data.
if (protocol_version() > SPDY3 && rst_stream.description().size() > 0) {
« no previous file with comments | « net/spdy/hpack_huffman_aggregator.cc ('k') | net/spdy/spdy_framer_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698