summaryrefslogtreecommitdiffstats
path: root/net/http
diff options
context:
space:
mode:
Diffstat (limited to 'net/http')
-rw-r--r--net/http/http_network_transaction.cc9
-rw-r--r--net/http/http_stream_factory_impl_job.cc4
2 files changed, 1 insertions, 12 deletions
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index 7f0ac4f..6018e63 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -1164,15 +1164,6 @@ int HttpNetworkTransaction::HandleSSLHandshakeError(int error) {
case ERR_SSL_VERSION_OR_CIPHER_MISMATCH:
case ERR_SSL_DECOMPRESSION_FAILURE_ALERT:
case ERR_SSL_BAD_RECORD_MAC_ALERT:
- if (ssl_config_.tls1_enabled) {
- // This could be a TLS-intolerant server, an SSL 3.0 server that
- // chose a TLS-only cipher suite or a server with buggy DEFLATE
- // support. Turn off TLS 1.0, DEFLATE support and retry.
- session_->http_stream_factory()->AddTLSIntolerantServer(
- HostPortPair::FromURL(request_->url));
- ResetConnectionAndRequestForResend();
- error = OK;
- }
break;
}
return error;
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc
index 401ba7d..c2a1f0b 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -862,10 +862,8 @@ void HttpStreamFactoryImpl::Job::InitSSLConfig(
const HostPortPair& origin_server,
SSLConfig* ssl_config) const {
if (stream_factory_->IsTLSIntolerantServer(origin_server)) {
- LOG(WARNING) << "Falling back to SSLv3 because host is TLS intolerant: "
+ LOG(WARNING) << "Not falling back to SSLv3 just because host is TLS intolerant: "
<< origin_server.ToString();
- ssl_config->ssl3_fallback = true;
- ssl_config->tls1_enabled = false;
}
if (proxy_info_.is_https() && ssl_config->send_client_cert) {