summaryrefslogtreecommitdiffstats
path: root/net/spdy/spdy_protocol.h
diff options
context:
space:
mode:
Diffstat (limited to 'net/spdy/spdy_protocol.h')
-rw-r--r--net/spdy/spdy_protocol.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/spdy/spdy_protocol.h b/net/spdy/spdy_protocol.h
index 49d8bdc..f02db45 100644
--- a/net/spdy/spdy_protocol.h
+++ b/net/spdy/spdy_protocol.h
@@ -184,7 +184,8 @@ enum SpdyStatusCodes {
UNSUPPORTED_VERSION = 4,
CANCEL = 5,
INTERNAL_ERROR = 6,
- NUM_STATUS_CODES = 7
+ FLOW_CONTROL_ERROR = 7,
+ NUM_STATUS_CODES = 8
};
// A SPDY stream id is a 31 bit entity.
@@ -403,9 +404,8 @@ class SpdyControlFrame : public SpdyFrame {
}
void set_version(uint16 version) {
- const uint16 kControlBit = 0x80;
- DCHECK_EQ(0, version & kControlBit);
- mutable_block()->control_.version_ = kControlBit | htons(version);
+ DCHECK_EQ(0u, version & kControlFlagMask);
+ mutable_block()->control_.version_ = htons(kControlFlagMask | version);
}
SpdyControlType type() const {