| Index: net/test/embedded_test_server/embedded_test_server.h
|
| diff --git a/net/test/embedded_test_server/embedded_test_server.h b/net/test/embedded_test_server/embedded_test_server.h
|
| index ad69a1418439b4f4bffaac8f29ba445e4e143017..5a646a4b63cdbc55d44738963d5f3bf837665b1b 100644
|
| --- a/net/test/embedded_test_server/embedded_test_server.h
|
| +++ b/net/test/embedded_test_server/embedded_test_server.h
|
| @@ -25,6 +25,7 @@
|
| #include "net/base/host_port_pair.h"
|
| #include "net/base/ip_endpoint.h"
|
| #include "net/cert/x509_certificate.h"
|
| +#include "net/socket/ssl_server_socket.h"
|
| #include "net/socket/stream_socket.h"
|
| #include "net/socket/tcp_server_socket.h"
|
| #include "net/ssl/ssl_server_config.h"
|
| @@ -243,6 +244,10 @@ class EmbeddedTestServer {
|
| void HandleRequest(HttpConnection* connection,
|
| scoped_ptr<HttpRequest> request);
|
|
|
| + // Initializes the SSLServerContext so that SSLServerSocket connections may
|
| + // share the same cache
|
| + void InitializeSSLServerContext();
|
| +
|
| HttpConnection* FindConnection(StreamSocket* socket);
|
|
|
| // Posts a task to the |io_thread_| and waits for a reply.
|
| @@ -272,6 +277,7 @@ class EmbeddedTestServer {
|
|
|
| net::SSLServerConfig ssl_config_;
|
| ServerCertificate cert_;
|
| + scoped_ptr<SSLServerContext> context_;
|
|
|
| base::WeakPtrFactory<EmbeddedTestServer> weak_factory_;
|
|
|
|
|