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

Unified Diff: net/test/spawned_test_server/base_test_server.cc

Issue 2205433002: Implement ALPN in tlslite. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 4 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
Index: net/test/spawned_test_server/base_test_server.cc
diff --git a/net/test/spawned_test_server/base_test_server.cc b/net/test/spawned_test_server/base_test_server.cc
index d7dbf95fb2d7014eeae85d17c383a74b4ffd9a36..793304f1880198c6fde028f6a367434193fcefa4 100644
--- a/net/test/spawned_test_server/base_test_server.cc
+++ b/net/test/spawned_test_server/base_test_server.cc
@@ -639,6 +639,13 @@ bool BaseTestServer::GenerateArguments(base::DictionaryValue* arguments) const {
arguments->Set("ocsp-server-unavailable",
base::Value::CreateNullValue());
}
+ if (!ssl_options_.alpn_protocols.empty()) {
+ std::unique_ptr<base::ListValue> alpn_protocols(new base::ListValue());
+ for (const std::string& proto : ssl_options_.alpn_protocols) {
+ alpn_protocols->AppendString(proto);
+ }
+ arguments->Set("alpn-protocols", std::move(alpn_protocols));
+ }
if (!ssl_options_.npn_protocols.empty()) {
std::unique_ptr<base::ListValue> npn_protocols(new base::ListValue());
for (const std::string& proto : ssl_options_.npn_protocols) {

Powered by Google App Engine
This is Rietveld 408576698