diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-24 17:52:09 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-24 17:52:09 +0000 |
| commit | 779642585a5a76bd1d3e77761bbc6774312e5ddd (patch) | |
| tree | d17a504999c653ab16c46123843b96768ed5d68a | |
| parent | c7c5630957fc47ad13604a92a27685d8e4a04aff (diff) | |
| download | chromium_src-779642585a5a76bd1d3e77761bbc6774312e5ddd.zip chromium_src-779642585a5a76bd1d3e77761bbc6774312e5ddd.tar.gz chromium_src-779642585a5a76bd1d3e77761bbc6774312e5ddd.tar.bz2 | |
Merge 225017 "net: disable TLS False Start."
> net: disable TLS False Start.
>
> Review URL: https://codereview.chromium.org/23455059
TBR=agl@chromium.org
Review URL: https://codereview.chromium.org/24412002
git-svn-id: svn://svn.chromium.org/chrome/branches/1599/src@225030 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 3 | ||||
| -rw-r--r-- | net/ssl/ssl_config_service.cc | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index 72154bb..f374ded 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -3141,8 +3141,7 @@ int SSLClientSocketNSS::InitializeSSLOptions() { net_log_, "SSL_OptionSet", "SSL_ENABLE_SESSION_TICKETS"); } - rv = SSL_OptionSet(nss_fd_, SSL_ENABLE_FALSE_START, - ssl_config_.false_start_enabled); + rv = SSL_OptionSet(nss_fd_, SSL_ENABLE_FALSE_START, PR_FALSE); if (rv != SECSuccess) LogFailedNSSFunction(net_log_, "SSL_OptionSet", "SSL_ENABLE_FALSE_START"); diff --git a/net/ssl/ssl_config_service.cc b/net/ssl/ssl_config_service.cc index a2c34a2..265b43c 100644 --- a/net/ssl/ssl_config_service.cc +++ b/net/ssl/ssl_config_service.cc @@ -42,7 +42,7 @@ SSLConfig::SSLConfig() version_max(g_default_version_max), cached_info_enabled(false), channel_id_enabled(true), - false_start_enabled(true), + false_start_enabled(false), unrestricted_ssl3_fallback_enabled(false), send_client_cert(false), verify_ev_cert(false), |