summaryrefslogtreecommitdiffstats
path: root/net/tools/flip_server
diff options
context:
space:
mode:
authorbnc@chromium.org <bnc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-21 20:17:38 +0000
committerbnc@chromium.org <bnc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-21 20:19:20 +0000
commit66961b2f5eaf8b0b2ed0bb63b3d1b3425a87e36f (patch)
tree1758977513dd508ce2710e48340d71e50fa37fb1 /net/tools/flip_server
parentee9ca0c8b3469a158546b4b6f15b068c1087f588 (diff)
downloadchromium_src-66961b2f5eaf8b0b2ed0bb63b3d1b3425a87e36f.zip
chromium_src-66961b2f5eaf8b0b2ed0bb63b3d1b3425a87e36f.tar.gz
chromium_src-66961b2f5eaf8b0b2ed0bb63b3d1b3425a87e36f.tar.bz2
HTTP2 draft 14 support
This master CL lands recent SPDY changes through 73573949, extending them with Chromium-specific updates to constants and enums, protocol negotiation tokens, and tests. This CL is intended to be commited but not reviewed, and is the union of the following changes, which in turn are intended to be reviewed but not commited. (Most recent on top, oldest on bottom.) Fix bug in HTTP/2 frame size limits. This lands server change 73573949. https://crrev.com/478903004 Update npn/alpn tokens to HTTP2-draft14. https://crrev.com/486493003 Add kSpdyMaxControlFrameSize and kControlFrameSizeLimit constants. This lands server change 73427537. https://crrev.com/486873002 Add TODO. This lands server change 73426819. https://crrev.com/479313002 Add an extra byte to the length field for HTTP/2 frame headers. This lands server change 73424406. https://crrev.com/479303002 Change order of tests. https://crrev.com/483863002 Remove reference set and exchange header and static table in HPACK. This lands server change 73299534. https://crrev.com/480573003 Add new settings to SPDY4 for h2-14. This lands server change 72726557. https://crrev.com/480183002 Add kHttp2VersionString. This lands server change 72173526. https://crrev.com/485813002 HTTP2 draft 13: support unknown frame types and settings types as extensions. This lands server change 70895882. https://crrev.com/483843004 Allow unrecognized error codes as part of HTTP/2 extensions. This lands server change 70873693. https://crrev.com/475043002 BUG=400336 Review URL: https://codereview.chromium.org/485833002 Cr-Commit-Position: refs/heads/master@{#291161} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291161 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools/flip_server')
-rw-r--r--net/tools/flip_server/spdy_interface.cc4
-rw-r--r--net/tools/flip_server/spdy_interface.h2
-rw-r--r--net/tools/flip_server/spdy_interface_test.cc1
3 files changed, 7 insertions, 0 deletions
diff --git a/net/tools/flip_server/spdy_interface.cc b/net/tools/flip_server/spdy_interface.cc
index 73025dd..eec20c0 100644
--- a/net/tools/flip_server/spdy_interface.cc
+++ b/net/tools/flip_server/spdy_interface.cc
@@ -296,6 +296,10 @@ void SpdySM::OnRstStream(SpdyStreamId stream_id, SpdyRstStreamStatus status) {
client_output_ordering_.RemoveStreamId(stream_id);
}
+bool SpdySM::OnUnknownFrame(SpdyStreamId stream_id, int frame_type) {
+ return false;
+}
+
size_t SpdySM::ProcessReadInput(const char* data, size_t len) {
DCHECK(buffered_spdy_framer_);
return buffered_spdy_framer_->ProcessInput(data, len);
diff --git a/net/tools/flip_server/spdy_interface.h b/net/tools/flip_server/spdy_interface.h
index e472cf2a..2174274 100644
--- a/net/tools/flip_server/spdy_interface.h
+++ b/net/tools/flip_server/spdy_interface.h
@@ -130,6 +130,8 @@ class SpdySM : public BufferedSpdyFramerVisitorInterface, public SMInterface {
SpdyStreamId promised_stream_id,
const SpdyHeaderBlock& headers) OVERRIDE {}
+ virtual bool OnUnknownFrame(SpdyStreamId stream_id, int frame_type) OVERRIDE;
+
public:
virtual size_t ProcessReadInput(const char* data, size_t len) OVERRIDE;
virtual size_t ProcessWriteInput(const char* data, size_t len) OVERRIDE;
diff --git a/net/tools/flip_server/spdy_interface_test.cc b/net/tools/flip_server/spdy_interface_test.cc
index 7e2e524..9e66d0c 100644
--- a/net/tools/flip_server/spdy_interface_test.cc
+++ b/net/tools/flip_server/spdy_interface_test.cc
@@ -66,6 +66,7 @@ class SpdyFramerVisitor : public BufferedSpdyFramerVisitorInterface {
MOCK_METHOD2(OnWindowUpdate, void(SpdyStreamId, uint32));
MOCK_METHOD3(OnPushPromise,
void(SpdyStreamId, SpdyStreamId, const SpdyHeaderBlock&));
+ MOCK_METHOD2(OnUnknownFrame, bool(SpdyStreamId stream_id, int frame_type));
};
class FakeSMConnection : public SMConnection {