Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(64)

Side by Side Diff: net/spdy/spdy_session.cc

Issue 8401024: Disable SPDY IP pooling for SSL connections with client authentication. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/socket/ssl_client_socket_win.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 certificate_error_code_ = certificate_error_code; 335 certificate_error_code_ = certificate_error_code;
336 336
337 // Write out any data that we might have to send, such as the settings frame. 337 // Write out any data that we might have to send, such as the settings frame.
338 WriteSocketLater(); 338 WriteSocketLater();
339 net::Error error = ReadSocket(); 339 net::Error error = ReadSocket();
340 if (error == ERR_IO_PENDING) 340 if (error == ERR_IO_PENDING)
341 return OK; 341 return OK;
342 return error; 342 return error;
343 } 343 }
344 344
345 bool SpdySession::VerifyDomainAuthentication(const std::string& domain) { 345 bool SpdySession::VerifyDomainAuthentication(const std::string& domain) {
wtc 2011/10/27 01:13:58 We may want to rename this method because it does
ramant (doing other things) 2011/10/27 16:20:33 +1
346 if (!verify_domain_authentication_) 346 if (!verify_domain_authentication_)
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
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
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698