| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/memory/linked_ptr.h" | 9 #include "base/memory/linked_ptr.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 347 return true; | 347 return true; |
| 348 | 348 |
| 349 if (state_ != CONNECTED) | 349 if (state_ != CONNECTED) |
| 350 return false; | 350 return false; |
| 351 | 351 |
| 352 SSLInfo ssl_info; | 352 SSLInfo ssl_info; |
| 353 bool was_npn_negotiated; | 353 bool was_npn_negotiated; |
| 354 if (!GetSSLInfo(&ssl_info, &was_npn_negotiated)) | 354 if (!GetSSLInfo(&ssl_info, &was_npn_negotiated)) |
| 355 return true; // This is not a secure session, so all domains are okay. | 355 return true; // This is not a secure session, so all domains are okay. |
| 356 | 356 |
| 357 return ssl_info.cert->VerifyNameMatch(domain); | 357 return !ssl_info.client_cert_sent && ssl_info.cert->VerifyNameMatch(domain); |
| 358 } | 358 } |
| 359 | 359 |
| 360 int SpdySession::GetPushStream( | 360 int SpdySession::GetPushStream( |
| 361 const GURL& url, | 361 const GURL& url, |
| 362 scoped_refptr<SpdyStream>* stream, | 362 scoped_refptr<SpdyStream>* stream, |
| 363 const BoundNetLog& stream_net_log) { | 363 const BoundNetLog& stream_net_log) { |
| 364 CHECK_NE(state_, CLOSED); | 364 CHECK_NE(state_, CLOSED); |
| 365 | 365 |
| 366 *stream = NULL; | 366 *stream = NULL; |
| 367 | 367 |
| (...skipping 1352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1720 if (it == pending_callback_map_.end()) | 1720 if (it == pending_callback_map_.end()) |
| 1721 return; | 1721 return; |
| 1722 | 1722 |
| 1723 OldCompletionCallback* callback = it->second.callback; | 1723 OldCompletionCallback* callback = it->second.callback; |
| 1724 int result = it->second.result; | 1724 int result = it->second.result; |
| 1725 pending_callback_map_.erase(it); | 1725 pending_callback_map_.erase(it); |
| 1726 callback->Run(result); | 1726 callback->Run(result); |
| 1727 } | 1727 } |
| 1728 | 1728 |
| 1729 } // namespace net | 1729 } // namespace net |
| OLD | NEW |