summaryrefslogtreecommitdiffstats
path: root/net/spdy/spdy_framer.cc
diff options
context:
space:
mode:
authormbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-09 16:12:03 +0000
committermbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-09 16:12:03 +0000
commit0ac338051b72a1e3717bcf8a54270cfeb50f1d13 (patch)
treee860fd6b2f50fb1b2e96081fae4f6600671bf5fb /net/spdy/spdy_framer.cc
parent7ca5cde25380c8dc47b5ac322e2893df875a4643 (diff)
downloadchromium_src-0ac338051b72a1e3717bcf8a54270cfeb50f1d13.zip
chromium_src-0ac338051b72a1e3717bcf8a54270cfeb50f1d13.tar.gz
chromium_src-0ac338051b72a1e3717bcf8a54270cfeb50f1d13.tar.bz2
Add support for the SPDY session frame.
BUG=34749 TEST=SpdyNetworkTransactionTest.SettingsSaved, SettingsPlayback Review URL: http://codereview.chromium.org/1595013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44092 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_framer.cc')
-rw-r--r--net/spdy/spdy_framer.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/spdy/spdy_framer.cc b/net/spdy/spdy_framer.cc
index 864a0d9..65ef2e5 100644
--- a/net/spdy/spdy_framer.cc
+++ b/net/spdy/spdy_framer.cc
@@ -298,6 +298,11 @@ void SpdyFramer::ProcessControlFrameHeader() {
SpdyGoAwayControlFrame::size() - SpdyFrame::size())
set_error(SPDY_INVALID_CONTROL_FRAME);
break;
+ case SETTINGS:
+ if (current_control_frame.length() <
+ SpdySettingsControlFrame::size() - SpdyControlFrame::size())
+ set_error(SPDY_INVALID_CONTROL_FRAME);
+ break;
default:
LOG(WARNING) << "Valid spdy control frame with unknown type: "
<< current_control_frame.type();