diff options
| author | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 18:19:17 +0000 |
|---|---|---|
| committer | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 18:19:17 +0000 |
| commit | 4c21b0f14edcb3bfc2c5c481428fe71bb9107817 (patch) | |
| tree | e3db730ecdb981b0c66035c6d3efc7431008a778 /net/spdy/spdy_protocol.h | |
| parent | 1655ba34a9191e59006bd7a48eb25b98319352e7 (diff) | |
| download | chromium_src-4c21b0f14edcb3bfc2c5c481428fe71bb9107817.zip chromium_src-4c21b0f14edcb3bfc2c5c481428fe71bb9107817.tar.gz chromium_src-4c21b0f14edcb3bfc2c5c481428fe71bb9107817.tar.bz2 | |
SPDY: Initial support for handling WINDOW_UPDATE frames and some cleanup.
BUG=48100
TEST=net_unittests --gtest_filter="SpdyProtocolTest.ControlFrameStructs:SpdyNetworkTransactionTest.WindowSizeChange:SpdyNetworkTransactionTest.WindowSizeOverflow"
Contributed by: agayev@google.com
Review URL: http://codereview.chromium.org/2807042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52352 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_protocol.h')
| -rw-r--r-- | net/spdy/spdy_protocol.h | 8 |
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 { |