diff options
| author | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 18:42:34 +0000 |
|---|---|---|
| committer | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 18:42:34 +0000 |
| commit | b32dad5244da13f39b02ca7913dbb5b0227461c3 (patch) | |
| tree | 1a269cfc5d4ddc369ba62ea1c462fdb0d13f5e59 /net/spdy/spdy_protocol.h | |
| parent | 542e199c802fdb7b13ebdb8f575c9e404eb1dbf4 (diff) | |
| download | chromium_src-b32dad5244da13f39b02ca7913dbb5b0227461c3.zip chromium_src-b32dad5244da13f39b02ca7913dbb5b0227461c3.tar.gz chromium_src-b32dad5244da13f39b02ca7913dbb5b0227461c3.tar.bz2 | |
Revert 52352 - 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
TBR=cbentzel@chromium.org
Review URL: http://codereview.chromium.org/2908010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52362 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 f02db45..49d8bdc 100644 --- a/net/spdy/spdy_protocol.h +++ b/net/spdy/spdy_protocol.h @@ -184,8 +184,7 @@ enum SpdyStatusCodes { UNSUPPORTED_VERSION = 4, CANCEL = 5, INTERNAL_ERROR = 6, - FLOW_CONTROL_ERROR = 7, - NUM_STATUS_CODES = 8 + NUM_STATUS_CODES = 7 }; // A SPDY stream id is a 31 bit entity. @@ -404,8 +403,9 @@ class SpdyControlFrame : public SpdyFrame { } void set_version(uint16 version) { - DCHECK_EQ(0u, version & kControlFlagMask); - mutable_block()->control_.version_ = htons(kControlFlagMask | version); + const uint16 kControlBit = 0x80; + DCHECK_EQ(0, version & kControlBit); + mutable_block()->control_.version_ = kControlBit | htons(version); } SpdyControlType type() const { |