| 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/spdy/spdy_session.h" | 5 #include "net/spdy/spdy_session.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <map> | 8 #include <map> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 #include "net/http/http_log_util.h" | 32 #include "net/http/http_log_util.h" |
| 33 #include "net/http/http_network_session.h" | 33 #include "net/http/http_network_session.h" |
| 34 #include "net/http/http_server_properties.h" | 34 #include "net/http/http_server_properties.h" |
| 35 #include "net/http/http_util.h" | 35 #include "net/http/http_util.h" |
| 36 #include "net/spdy/spdy_buffer_producer.h" | 36 #include "net/spdy/spdy_buffer_producer.h" |
| 37 #include "net/spdy/spdy_frame_builder.h" | 37 #include "net/spdy/spdy_frame_builder.h" |
| 38 #include "net/spdy/spdy_http_utils.h" | 38 #include "net/spdy/spdy_http_utils.h" |
| 39 #include "net/spdy/spdy_protocol.h" | 39 #include "net/spdy/spdy_protocol.h" |
| 40 #include "net/spdy/spdy_session_pool.h" | 40 #include "net/spdy/spdy_session_pool.h" |
| 41 #include "net/spdy/spdy_stream.h" | 41 #include "net/spdy/spdy_stream.h" |
| 42 #include "net/ssl/server_bound_cert_service.h" | 42 #include "net/ssl/channel_id_service.h" |
| 43 #include "net/ssl/ssl_cipher_suite_names.h" | 43 #include "net/ssl/ssl_cipher_suite_names.h" |
| 44 #include "net/ssl/ssl_connection_status_flags.h" | 44 #include "net/ssl/ssl_connection_status_flags.h" |
| 45 | 45 |
| 46 namespace net { | 46 namespace net { |
| 47 | 47 |
| 48 namespace { | 48 namespace { |
| 49 | 49 |
| 50 const int kReadBufferSize = 8 * 1024; | 50 const int kReadBufferSize = 8 * 1024; |
| 51 const int kDefaultConnectionAtRiskOfLossSeconds = 10; | 51 const int kDefaultConnectionAtRiskOfLossSeconds = 10; |
| 52 const int kHungIntervalSeconds = 10; | 52 const int kHungIntervalSeconds = 10; |
| (...skipping 655 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 708 SSLInfo ssl_info; | 708 SSLInfo ssl_info; |
| 709 bool was_npn_negotiated; | 709 bool was_npn_negotiated; |
| 710 NextProto protocol_negotiated = kProtoUnknown; | 710 NextProto protocol_negotiated = kProtoUnknown; |
| 711 if (!GetSSLInfo(&ssl_info, &was_npn_negotiated, &protocol_negotiated)) | 711 if (!GetSSLInfo(&ssl_info, &was_npn_negotiated, &protocol_negotiated)) |
| 712 return true; // This is not a secure session, so all domains are okay. | 712 return true; // This is not a secure session, so all domains are okay. |
| 713 | 713 |
| 714 bool unused = false; | 714 bool unused = false; |
| 715 return | 715 return |
| 716 !ssl_info.client_cert_sent && | 716 !ssl_info.client_cert_sent && |
| 717 (!ssl_info.channel_id_sent || | 717 (!ssl_info.channel_id_sent || |
| 718 (ServerBoundCertService::GetDomainForHost(domain) == | 718 (ChannelIDService::GetDomainForHost(domain) == |
| 719 ServerBoundCertService::GetDomainForHost(host_port_pair().host()))) && | 719 ChannelIDService::GetDomainForHost(host_port_pair().host()))) && |
| 720 ssl_info.cert->VerifyNameMatch(domain, &unused); | 720 ssl_info.cert->VerifyNameMatch(domain, &unused); |
| 721 } | 721 } |
| 722 | 722 |
| 723 int SpdySession::GetPushStream( | 723 int SpdySession::GetPushStream( |
| 724 const GURL& url, | 724 const GURL& url, |
| 725 base::WeakPtr<SpdyStream>* stream, | 725 base::WeakPtr<SpdyStream>* stream, |
| 726 const BoundNetLog& stream_net_log) { | 726 const BoundNetLog& stream_net_log) { |
| 727 CHECK(!in_io_loop_); | 727 CHECK(!in_io_loop_); |
| 728 | 728 |
| 729 stream->reset(); | 729 stream->reset(); |
| (...skipping 2403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3133 if (!queue->empty()) { | 3133 if (!queue->empty()) { |
| 3134 SpdyStreamId stream_id = queue->front(); | 3134 SpdyStreamId stream_id = queue->front(); |
| 3135 queue->pop_front(); | 3135 queue->pop_front(); |
| 3136 return stream_id; | 3136 return stream_id; |
| 3137 } | 3137 } |
| 3138 } | 3138 } |
| 3139 return 0; | 3139 return 0; |
| 3140 } | 3140 } |
| 3141 | 3141 |
| 3142 } // namespace net | 3142 } // namespace net |
| OLD | NEW |