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

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

Issue 25977005: [SPDY] Do not advertise SPDY/2 by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 2 months 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/spdy/spdy_proxy_client_socket_unittest.cc ('k') | net/spdy/spdy_session_pool_unittest.cc » ('j') | 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) 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_pool.h" 5 #include "net/spdy/spdy_session_pool.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "net/base/address_list.h" 10 #include "net/base/address_list.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 resolver_(resolver), 47 resolver_(resolver),
48 verify_domain_authentication_(true), 48 verify_domain_authentication_(true),
49 enable_sending_initial_data_(true), 49 enable_sending_initial_data_(true),
50 force_single_domain_(force_single_domain), 50 force_single_domain_(force_single_domain),
51 enable_ip_pooling_(enable_ip_pooling), 51 enable_ip_pooling_(enable_ip_pooling),
52 enable_credential_frames_(enable_credential_frames), 52 enable_credential_frames_(enable_credential_frames),
53 enable_compression_(enable_compression), 53 enable_compression_(enable_compression),
54 enable_ping_based_connection_checking_( 54 enable_ping_based_connection_checking_(
55 enable_ping_based_connection_checking), 55 enable_ping_based_connection_checking),
56 // TODO(akalin): Force callers to have a valid value of 56 // TODO(akalin): Force callers to have a valid value of
57 // |default_protocol_|. Or at least make the default be 57 // |default_protocol_|.
58 // kProtoSPDY3.
59 default_protocol_( 58 default_protocol_(
60 (default_protocol == kProtoUnknown) ? 59 (default_protocol == kProtoUnknown) ?
61 kProtoSPDY2 : default_protocol), 60 kProtoSPDY3 : default_protocol),
62 stream_initial_recv_window_size_(stream_initial_recv_window_size), 61 stream_initial_recv_window_size_(stream_initial_recv_window_size),
63 initial_max_concurrent_streams_(initial_max_concurrent_streams), 62 initial_max_concurrent_streams_(initial_max_concurrent_streams),
64 max_concurrent_streams_limit_(max_concurrent_streams_limit), 63 max_concurrent_streams_limit_(max_concurrent_streams_limit),
65 time_func_(time_func), 64 time_func_(time_func),
66 trusted_spdy_proxy_( 65 trusted_spdy_proxy_(
67 HostPortPair::FromString(trusted_spdy_proxy)) { 66 HostPortPair::FromString(trusted_spdy_proxy)) {
68 DCHECK(default_protocol_ >= kProtoSPDYMinimumVersion && 67 DCHECK(default_protocol_ >= kProtoSPDYMinimumVersion &&
69 default_protocol_ <= kProtoSPDYMaximumVersion); 68 default_protocol_ <= kProtoSPDYMaximumVersion);
70 NetworkChangeNotifier::AddIPAddressObserver(this); 69 NetworkChangeNotifier::AddIPAddressObserver(this);
71 if (ssl_config_service_.get()) 70 if (ssl_config_service_.get())
(...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 if (idle_only && (*it)->is_active()) 385 if (idle_only && (*it)->is_active())
387 continue; 386 continue;
388 387
389 (*it)->CloseSessionOnError(error, description); 388 (*it)->CloseSessionOnError(error, description);
390 DCHECK(!IsSessionAvailable(*it)); 389 DCHECK(!IsSessionAvailable(*it));
391 DCHECK(!*it); 390 DCHECK(!*it);
392 } 391 }
393 } 392 }
394 393
395 } // namespace net 394 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/spdy_proxy_client_socket_unittest.cc ('k') | net/spdy/spdy_session_pool_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698