Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(502)

Unified Diff: net/http/http_server_properties_impl.cc

Issue 9618002: SPDY - integration of spdy/3 code. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_server_properties_impl.h ('k') | net/http/http_server_properties_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_server_properties_impl.cc
===================================================================
--- net/http/http_server_properties_impl.cc (revision 126086)
+++ net/http/http_server_properties_impl.cc (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -241,8 +241,8 @@
for (it = settings.begin(); it != settings.end(); ++it) {
spdy::SettingsFlagsAndId id = it->first;
if (id.flags() & spdy::SETTINGS_FLAG_PLEASE_PERSIST) {
- id.set_flags(spdy::SETTINGS_FLAG_PERSISTED);
- persistent_settings.push_back(std::make_pair(id, it->second));
+ spdy::SettingsFlagsAndId new_id(spdy::SETTINGS_FLAG_PERSISTED, id.id());
+ persistent_settings.push_back(std::make_pair(new_id, it->second));
}
}
@@ -254,6 +254,27 @@
return true;
}
+bool HttpServerPropertiesImpl::SetSpdySetting(
+ const HostPortPair& host_port_pair,
+ const spdy::SpdySetting& setting) {
+
+ spdy::SettingsFlagsAndId id = setting.first;
+ if (!(id.flags() & spdy::SETTINGS_FLAG_PLEASE_PERSIST))
+ return false;
+
+ SpdySettingsMap::const_iterator it = spdy_settings_map_.find(host_port_pair);
+ spdy::SpdySettings persistent_settings;
+ if (it != spdy_settings_map_.end()) {
+ persistent_settings = it->second;
+ }
+
+ spdy::SettingsFlagsAndId new_id(spdy::SETTINGS_FLAG_PERSISTED, id.id());
+ persistent_settings.push_back(std::make_pair(new_id, setting.second));
+ spdy_settings_map_[host_port_pair] = persistent_settings;
+
+ return true;
+}
+
void HttpServerPropertiesImpl::ClearSpdySettings() {
spdy_settings_map_.clear();
}
« no previous file with comments | « net/http/http_server_properties_impl.h ('k') | net/http/http_server_properties_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698