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

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

Issue 994373004: Properly handle alerts from the peer in SSL_read. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix CrOS tests Created 5 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/test/spawned_test_server/base_test_server.h ('k') | net/tools/testserver/testserver.py » ('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 d27eacbd96bf0cc58830a729b9485032472b9dbc..db64e1f04e205c7c9f4106871b3cc6e88d771143 100644
--- a/net/test/spawned_test_server/base_test_server.cc
+++ b/net/test/spawned_test_server/base_test_server.cc
@@ -104,7 +104,8 @@ BaseTestServer::SSLOptions::SSLOptions()
fallback_scsv_enabled(false),
staple_ocsp_response(false),
ocsp_server_unavailable(false),
- enable_npn(false) {
+ enable_npn(false),
+ alert_after_handshake(false) {
}
BaseTestServer::SSLOptions::SSLOptions(
@@ -121,7 +122,8 @@ BaseTestServer::SSLOptions::SSLOptions(
fallback_scsv_enabled(false),
staple_ocsp_response(false),
ocsp_server_unavailable(false),
- enable_npn(false) {
+ enable_npn(false),
+ alert_after_handshake(false) {
}
BaseTestServer::SSLOptions::~SSLOptions() {}
@@ -484,6 +486,8 @@ bool BaseTestServer::GenerateArguments(base::DictionaryValue* arguments) const {
}
if (ssl_options_.enable_npn)
arguments->Set("enable-npn", base::Value::CreateNullValue());
+ if (ssl_options_.alert_after_handshake)
+ arguments->Set("alert-after-handshake", base::Value::CreateNullValue());
}
return GenerateAdditionalArguments(arguments);
« no previous file with comments | « net/test/spawned_test_server/base_test_server.h ('k') | net/tools/testserver/testserver.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698