| Index: net/test/test_server.cc
|
| diff --git a/net/test/test_server.cc b/net/test/test_server.cc
|
| index c27f73b8dcfb6949f0147f452ab643cb4f34bb32..07575a26ccd0e33e913f2f03bfb6cbb027f92fa8 100644
|
| --- a/net/test/test_server.cc
|
| +++ b/net/test/test_server.cc
|
| @@ -56,13 +56,15 @@ std::string GetHostname(TestServer::Type type,
|
| TestServer::HTTPSOptions::HTTPSOptions()
|
| : server_certificate(CERT_OK),
|
| request_client_certificate(false),
|
| - bulk_ciphers(HTTPSOptions::BULK_CIPHER_ANY) {}
|
| + bulk_ciphers(HTTPSOptions::BULK_CIPHER_ANY),
|
| + record_resume(false) {}
|
|
|
| TestServer::HTTPSOptions::HTTPSOptions(
|
| TestServer::HTTPSOptions::ServerCertificate cert)
|
| : server_certificate(cert),
|
| request_client_certificate(false),
|
| - bulk_ciphers(HTTPSOptions::BULK_CIPHER_ANY) {}
|
| + bulk_ciphers(HTTPSOptions::BULK_CIPHER_ANY),
|
| + record_resume(false) {}
|
|
|
| TestServer::HTTPSOptions::~HTTPSOptions() {}
|
|
|
| @@ -409,6 +411,9 @@ bool TestServer::AddCommandLineArguments(CommandLine* command_line) const {
|
| command_line->AppendArg(kBulkCipherSwitch + "=aes256");
|
| if (https_options_.bulk_ciphers & HTTPSOptions::BULK_CIPHER_3DES)
|
| command_line->AppendArg(kBulkCipherSwitch + "=3des");
|
| +
|
| + if (https_options_.record_resume)
|
| + command_line->AppendArg("--https-record-resume");
|
| }
|
|
|
| return true;
|
|
|