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

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

Issue 416683002: This CL corrects a bug in which the OnHandshakeComplete callback for an ssl session was never called (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@r2
Patch Set: Fixed typos & updated flag description Created 6 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 26608c63bbd561d638a96a81b6d99afb2bd37acd..5cc6eb6733833393b7016f47f16b98559d24798e 100644
--- a/net/test/spawned_test_server/base_test_server.cc
+++ b/net/test/spawned_test_server/base_test_server.cc
@@ -101,7 +101,9 @@ BaseTestServer::SSLOptions::SSLOptions()
tls_intolerance_type(TLS_INTOLERANCE_ALERT),
fallback_scsv_enabled(false),
staple_ocsp_response(false),
- enable_npn(false) {}
+ enable_npn(false),
+ disable_session_cache(false) {
+}
BaseTestServer::SSLOptions::SSLOptions(
BaseTestServer::SSLOptions::ServerCertificate cert)
@@ -116,7 +118,9 @@ BaseTestServer::SSLOptions::SSLOptions(
tls_intolerance_type(TLS_INTOLERANCE_ALERT),
fallback_scsv_enabled(false),
staple_ocsp_response(false),
- enable_npn(false) {}
+ enable_npn(false),
+ disable_session_cache(false) {
+}
BaseTestServer::SSLOptions::~SSLOptions() {}
@@ -474,6 +478,8 @@ bool BaseTestServer::GenerateArguments(base::DictionaryValue* arguments) const {
arguments->Set("staple-ocsp-response", base::Value::CreateNullValue());
if (ssl_options_.enable_npn)
arguments->Set("enable-npn", base::Value::CreateNullValue());
+ if (ssl_options_.disable_session_cache)
+ arguments->Set("disable-session-cache", base::Value::CreateNullValue());
}
return GenerateAdditionalArguments(arguments);

Powered by Google App Engine
This is Rietveld 408576698