| Index: net/socket/ssl_server_socket_nss.cc
|
| diff --git a/net/socket/ssl_server_socket_nss.cc b/net/socket/ssl_server_socket_nss.cc
|
| index 60de5c6959d18b57993ab04f8bdc82d93aef350d..3a6ac1682bab1be4c7fcf819af59a2db62390280 100644
|
| --- a/net/socket/ssl_server_socket_nss.cc
|
| +++ b/net/socket/ssl_server_socket_nss.cc
|
| @@ -37,6 +37,7 @@
|
| #include "net/base/net_log.h"
|
| #include "net/ocsp/nss_ocsp.h"
|
| #include "net/socket/nss_ssl_util.h"
|
| +#include "net/socket/nss_ssl_util_internal.h"
|
| #include "net/socket/ssl_error_params.h"
|
|
|
| static const int kRecvBufferSize = 4096;
|
| @@ -335,12 +336,6 @@ int SSLServerSocketNSS::InitializeSSLOptions() {
|
| return ERR_UNEXPECTED;
|
| }
|
|
|
| - rv = SSL_ConfigServerSessionIDCache(1024, 5, 5, NULL);
|
| - if (rv != SECSuccess) {
|
| - LogFailedNSSFunction(net_log_, "SSL_ConfigureServerSessionIDCache", "");
|
| - return ERR_UNEXPECTED;
|
| - }
|
| -
|
| rv = SSL_AuthCertificateHook(nss_fd_, OwnAuthCertHandler, this);
|
| if (rv != SECSuccess) {
|
| LogFailedNSSFunction(net_log_, "SSL_AuthCertificateHook", "");
|
| @@ -771,6 +766,7 @@ int SSLServerSocketNSS::Init() {
|
| if (!NSS_IsInitialized())
|
| return ERR_UNEXPECTED;
|
|
|
| + EnsureNSSSSLServerInit();
|
| return OK;
|
| }
|
|
|
|
|