diff options
| author | rtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-12 18:42:12 +0000 |
|---|---|---|
| committer | rtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-12 18:42:12 +0000 |
| commit | 39c48fcca9e6dfcd163778ed17d3eff865cf204b (patch) | |
| tree | eb28e6daabb23f5d290466102dc729da83708271 /net/tools | |
| parent | a1b9abbd91e5cfa56fb2649ce86709fac623f4ed (diff) | |
| download | chromium_src-39c48fcca9e6dfcd163778ed17d3eff865cf204b.zip chromium_src-39c48fcca9e6dfcd163778ed17d3eff865cf204b.tar.gz chromium_src-39c48fcca9e6dfcd163778ed17d3eff865cf204b.tar.bz2 | |
SPDY - integration of spdy/3 code.
TEST=network unit tests and browser unit_tests
R=willchan
Review URL: https://chromiumcodereview.appspot.com/9618002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126175 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
| -rw-r--r-- | net/tools/flip_server/spdy_interface.cc | 4 | ||||
| -rw-r--r-- | net/tools/flip_server/spdy_interface.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/tools/flip_server/spdy_interface.cc b/net/tools/flip_server/spdy_interface.cc index 3ccc672..4638b1f 100644 --- a/net/tools/flip_server/spdy_interface.cc +++ b/net/tools/flip_server/spdy_interface.cc @@ -319,10 +319,10 @@ void SpdySM::ResetForNewConnection() { // Send a settings frame int SpdySM::PostAcceptHook() { SpdySettings settings; - SettingsFlagsAndId settings_id(SETTINGS_MAX_CONCURRENT_STREAMS); + SettingsFlagsAndId settings_id(0, SETTINGS_MAX_CONCURRENT_STREAMS); settings.push_back(SpdySetting(settings_id, 100)); SpdySettingsControlFrame* settings_frame = - SpdyFramer::CreateSettings(settings); + buffered_spdy_framer_->CreateSettings(settings); VLOG(1) << ACCEPTOR_CLIENT_IDENT << "Sending Settings Frame"; EnqueueDataFrame(new SpdyFrameDataFrame(settings_frame)); diff --git a/net/tools/flip_server/spdy_interface.h b/net/tools/flip_server/spdy_interface.h index d0e30ee..621a4ee 100644 --- a/net/tools/flip_server/spdy_interface.h +++ b/net/tools/flip_server/spdy_interface.h @@ -68,13 +68,13 @@ class SpdySM : public spdy::BufferedSpdyFramerVisitorInterface, const spdy::SpdyRstStreamControlFrame& frame) OVERRIDE; virtual void OnGoAway(const spdy::SpdyGoAwayControlFrame& frame) OVERRIDE {} virtual void OnPing(const spdy::SpdyPingControlFrame& frame) OVERRIDE {} - virtual void OnSettings( - const spdy::SpdySettingsControlFrame& frame) OVERRIDE {} virtual void OnWindowUpdate( const spdy::SpdyWindowUpdateControlFrame& frame) OVERRIDE {} virtual void OnStreamFrameData(spdy::SpdyStreamId stream_id, const char* data, size_t len) OVERRIDE; + virtual void OnSetting( + spdy::SpdySettingsIds id, uint8 flags, uint32 value) OVERRIDE {} virtual void OnSynStream( const spdy::SpdySynStreamControlFrame& frame, const linked_ptr<spdy::SpdyHeaderBlock>& headers) OVERRIDE; |