OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "net/http/http_stream_factory_impl_job.h" | 5 #include "net/http/http_stream_factory_impl_job.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
(...skipping 782 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
793 // is a potentially recoverable error. | 793 // is a potentially recoverable error. |
794 // and connection_->socket == NULL and connection_->is_ssl_error() is true, | 794 // and connection_->socket == NULL and connection_->is_ssl_error() is true, |
795 // then the SSL handshake ran with an unrecoverable error. | 795 // then the SSL handshake ran with an unrecoverable error. |
796 // otherwise, the error came from one of the other pools. | 796 // otherwise, the error came from one of the other pools. |
797 bool ssl_started = using_ssl_ && (result == OK || connection_->socket() || | 797 bool ssl_started = using_ssl_ && (result == OK || connection_->socket() || |
798 connection_->is_ssl_error()); | 798 connection_->is_ssl_error()); |
799 | 799 |
800 if (ssl_started && (result == OK || IsCertificateError(result))) { | 800 if (ssl_started && (result == OK || IsCertificateError(result))) { |
801 SSLClientSocket* ssl_socket = | 801 SSLClientSocket* ssl_socket = |
802 static_cast<SSLClientSocket*>(connection_->socket()); | 802 static_cast<SSLClientSocket*>(connection_->socket()); |
803 if (ssl_socket->was_npn_negotiated()) { | 803 if (ssl_socket->WasNpnNegotiated()) { |
804 was_npn_negotiated_ = true; | 804 was_npn_negotiated_ = true; |
805 std::string proto; | 805 std::string proto; |
806 std::string server_protos; | 806 std::string server_protos; |
807 SSLClientSocket::NextProtoStatus status = | 807 SSLClientSocket::NextProtoStatus status = |
808 ssl_socket->GetNextProto(&proto, &server_protos); | 808 ssl_socket->GetNextProto(&proto, &server_protos); |
809 NextProto protocol_negotiated = | 809 NextProto protocol_negotiated = |
810 SSLClientSocket::NextProtoFromString(proto); | 810 SSLClientSocket::NextProtoFromString(proto); |
811 protocol_negotiated_ = protocol_negotiated; | 811 protocol_negotiated_ = protocol_negotiated; |
812 net_log_.AddEvent( | 812 net_log_.AddEvent( |
813 NetLog::TYPE_HTTP_STREAM_REQUEST_PROTO, | 813 NetLog::TYPE_HTTP_STREAM_REQUEST_PROTO, |
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1281 (net::LOAD_MAIN_FRAME | net::LOAD_SUB_FRAME | net::LOAD_PREFETCH | | 1281 (net::LOAD_MAIN_FRAME | net::LOAD_SUB_FRAME | net::LOAD_PREFETCH | |
1282 net::LOAD_IS_DOWNLOAD)) { | 1282 net::LOAD_IS_DOWNLOAD)) { |
1283 // Avoid pipelining resources that may be streamed for a long time. | 1283 // Avoid pipelining resources that may be streamed for a long time. |
1284 return false; | 1284 return false; |
1285 } | 1285 } |
1286 return stream_factory_->http_pipelined_host_pool_.IsKeyEligibleForPipelining( | 1286 return stream_factory_->http_pipelined_host_pool_.IsKeyEligibleForPipelining( |
1287 *http_pipelining_key_.get()); | 1287 *http_pipelining_key_.get()); |
1288 } | 1288 } |
1289 | 1289 |
1290 } // namespace net | 1290 } // namespace net |
OLD | NEW |