Index: net/spdy/spdy_framer.cc |
diff --git a/net/spdy/spdy_framer.cc b/net/spdy/spdy_framer.cc |
index db3a3edd623cfacbc1065a23b6caef5392a7a177..1b3ef6e3fed0b29c234366a906e8eb32227383c5 100644 |
--- a/net/spdy/spdy_framer.cc |
+++ b/net/spdy/spdy_framer.cc |
@@ -974,9 +974,7 @@ void SpdyFramer::ProcessControlFrameHeader(uint16 control_frame_type_field) { |
if (current_frame_length_ < GetContinuationMinimumSize() || |
protocol_version() <= SPDY3) { |
set_error(SPDY_INVALID_CONTROL_FRAME); |
- } else if (current_frame_flags_ & |
- ~(HEADERS_FLAG_END_HEADERS | HEADERS_FLAG_PAD_LOW | |
- HEADERS_FLAG_PAD_HIGH)) { |
+ } else if (current_frame_flags_ & ~HEADERS_FLAG_END_HEADERS) { |
set_error(SPDY_INVALID_CONTROL_FRAME_FLAGS); |
} |
break; |
@@ -1518,7 +1516,7 @@ size_t SpdyFramer::ProcessControlFrameBeforeHeaderBlock(const char* data, |
(current_frame_flags_ & |
HEADERS_FLAG_END_HEADERS) != 0); |
} |
- CHANGE_STATE(SPDY_READ_PADDING_LENGTH); |
+ CHANGE_STATE(SPDY_CONTROL_FRAME_HEADER_BLOCK); |
break; |
default: |
DCHECK(false); |
@@ -2123,7 +2121,6 @@ size_t SpdyFramer::ProcessFramePaddingLength(const char* data, size_t len) { |
} else { |
DCHECK(current_frame_type_ == HEADERS || |
current_frame_type_ == PUSH_PROMISE || |
- current_frame_type_ == CONTINUATION || |
current_frame_type_ == SYN_STREAM || |
current_frame_type_ == SYN_REPLY) |
<< current_frame_type_; |