| 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 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 529 | 529 |
| 530 if (availability_state_ == STATE_CLOSED) | 530 if (availability_state_ == STATE_CLOSED) |
| 531 return false; | 531 return false; |
| 532 | 532 |
| 533 SSLInfo ssl_info; | 533 SSLInfo ssl_info; |
| 534 bool was_npn_negotiated; | 534 bool was_npn_negotiated; |
| 535 NextProto protocol_negotiated = kProtoUnknown; | 535 NextProto protocol_negotiated = kProtoUnknown; |
| 536 if (!GetSSLInfo(&ssl_info, &was_npn_negotiated, &protocol_negotiated)) | 536 if (!GetSSLInfo(&ssl_info, &was_npn_negotiated, &protocol_negotiated)) |
| 537 return true; // This is not a secure session, so all domains are okay. | 537 return true; // This is not a secure session, so all domains are okay. |
| 538 | 538 |
| 539 bool unused = false; |
| 539 return !ssl_info.client_cert_sent && | 540 return !ssl_info.client_cert_sent && |
| 540 (enable_credential_frames_ || !ssl_info.channel_id_sent || | 541 (enable_credential_frames_ || !ssl_info.channel_id_sent || |
| 541 ServerBoundCertService::GetDomainForHost(domain) == | 542 ServerBoundCertService::GetDomainForHost(domain) == |
| 542 ServerBoundCertService::GetDomainForHost(host_port_pair().host())) && | 543 ServerBoundCertService::GetDomainForHost(host_port_pair().host())) && |
| 543 ssl_info.cert->VerifyNameMatch(domain); | 544 ssl_info.cert->VerifyNameMatch(domain, &unused); |
| 544 } | 545 } |
| 545 | 546 |
| 546 int SpdySession::GetPushStream( | 547 int SpdySession::GetPushStream( |
| 547 const GURL& url, | 548 const GURL& url, |
| 548 base::WeakPtr<SpdyStream>* stream, | 549 base::WeakPtr<SpdyStream>* stream, |
| 549 const BoundNetLog& stream_net_log) { | 550 const BoundNetLog& stream_net_log) { |
| 550 CHECK(!in_io_loop_); | 551 CHECK(!in_io_loop_); |
| 551 | 552 |
| 552 stream->reset(); | 553 stream->reset(); |
| 553 | 554 |
| (...skipping 2377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2931 if (!queue->empty()) { | 2932 if (!queue->empty()) { |
| 2932 SpdyStreamId stream_id = queue->front(); | 2933 SpdyStreamId stream_id = queue->front(); |
| 2933 queue->pop_front(); | 2934 queue->pop_front(); |
| 2934 return stream_id; | 2935 return stream_id; |
| 2935 } | 2936 } |
| 2936 } | 2937 } |
| 2937 return 0; | 2938 return 0; |
| 2938 } | 2939 } |
| 2939 | 2940 |
| 2940 } // namespace net | 2941 } // namespace net |
| OLD | NEW |