| 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 016c9301edf69ee18bbed20f2805567b0d26eeff..f2a2669f6b928b5190c6efb4584ffc02f8692563 100644
|
| --- a/net/test/spawned_test_server/base_test_server.cc
|
| +++ b/net/test/spawned_test_server/base_test_server.cc
|
| @@ -83,6 +83,7 @@ BaseTestServer::SSLOptions::SSLOptions()
|
| bulk_ciphers(SSLOptions::BULK_CIPHER_ANY),
|
| record_resume(false),
|
| tls_intolerant(TLS_INTOLERANT_NONE),
|
| + reset_on_intolerance(false),
|
| fallback_scsv_enabled(false),
|
| staple_ocsp_response(false),
|
| enable_npn(false) {}
|
| @@ -97,6 +98,7 @@ BaseTestServer::SSLOptions::SSLOptions(
|
| bulk_ciphers(SSLOptions::BULK_CIPHER_ANY),
|
| record_resume(false),
|
| tls_intolerant(TLS_INTOLERANT_NONE),
|
| + reset_on_intolerance(false),
|
| fallback_scsv_enabled(false),
|
| staple_ocsp_response(false),
|
| enable_npn(false) {}
|
| @@ -438,6 +440,8 @@ bool BaseTestServer::GenerateArguments(base::DictionaryValue* arguments) const {
|
| arguments->Set("tls-intolerant",
|
| new base::FundamentalValue(ssl_options_.tls_intolerant));
|
| }
|
| + if (ssl_options_.reset_on_intolerance)
|
| + arguments->Set("reset-on-intolerance", base::Value::CreateNullValue());
|
| if (ssl_options_.fallback_scsv_enabled)
|
| arguments->Set("fallback-scsv", base::Value::CreateNullValue());
|
| if (!ssl_options_.signed_cert_timestamps_tls_ext.empty()) {
|
|
|