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

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

Issue 723343002: Update from https://crrev.com/304121 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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/test/spawned_test_server/base_test_server.h ('k') | net/test/url_request/url_request_mock_http_job.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 0e23c7a3b55af7e00380d79baa594d94d580f21c..0c586f223eef1363f7886fb36cc6747bf3978568 100644
--- a/net/test/spawned_test_server/base_test_server.cc
+++ b/net/test/spawned_test_server/base_test_server.cc
@@ -101,6 +101,7 @@ BaseTestServer::SSLOptions::SSLOptions()
tls_intolerance_type(TLS_INTOLERANCE_ALERT),
fallback_scsv_enabled(false),
staple_ocsp_response(false),
+ ocsp_server_unavailable(false),
enable_npn(false),
disable_session_cache(false) {
}
@@ -118,6 +119,7 @@ BaseTestServer::SSLOptions::SSLOptions(
tls_intolerance_type(TLS_INTOLERANCE_ALERT),
fallback_scsv_enabled(false),
staple_ocsp_response(false),
+ ocsp_server_unavailable(false),
enable_npn(false),
disable_session_cache(false) {
}
@@ -476,6 +478,10 @@ bool BaseTestServer::GenerateArguments(base::DictionaryValue* arguments) const {
}
if (ssl_options_.staple_ocsp_response)
arguments->Set("staple-ocsp-response", base::Value::CreateNullValue());
+ if (ssl_options_.ocsp_server_unavailable) {
+ arguments->Set("ocsp-server-unavailable",
+ base::Value::CreateNullValue());
+ }
if (ssl_options_.enable_npn)
arguments->Set("enable-npn", base::Value::CreateNullValue());
if (ssl_options_.disable_session_cache)
« no previous file with comments | « net/test/spawned_test_server/base_test_server.h ('k') | net/test/url_request/url_request_mock_http_job.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698