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

Unified Diff: net/test/embedded_test_server/embedded_test_server.cc

Issue 1518613002: Support for server session cache. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@client_certs
Patch Set: Rebase only Created 4 years, 11 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
« net/socket/ssl_server_socket_unittest.cc ('K') | « net/ssl/ssl_server_config.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/test/embedded_test_server/embedded_test_server.cc
diff --git a/net/test/embedded_test_server/embedded_test_server.cc b/net/test/embedded_test_server/embedded_test_server.cc
index 8f10e1ca301bf55318704d7bb147bc80db2690d6..49fcf67eac3ed782d04b7862a97acffae0bf3855 100644
--- a/net/test/embedded_test_server/embedded_test_server.cc
+++ b/net/test/embedded_test_server/embedded_test_server.cc
@@ -292,8 +292,10 @@ scoped_ptr<StreamSocket> EmbeddedTestServer::DoSSLUpgrade(
scoped_ptr<crypto::RSAPrivateKey> server_key(
crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(key_vector));
- return CreateSSLServerSocket(std::move(connection), GetCertificate().get(),
- *server_key, ssl_config_);
+ scoped_ptr<SSLServerSocketContext> context = CreateSSLServerSocketContext(
+ GetCertificate().get(), *server_key, ssl_config_);
+
+ return context->CreateSSLServerSocket(std::move(connection));
davidben 2016/01/22 23:57:48 The socket should not outlive the context, nor sho
ryanchung 2016/01/29 23:28:16 I moved the context creation to InitializeAndListe
}
void EmbeddedTestServer::DoAcceptLoop() {
« net/socket/ssl_server_socket_unittest.cc ('K') | « net/ssl/ssl_server_config.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698