commit 5acdce175d32ba915ac5933ae197e4fc59f7ec8f
author kristianm@google.com <kristianm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> Wed Mar 30 13:00:20 2011
committer kristianm@google.com <kristianm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> Wed Mar 30 13:00:20 2011
tree 453c421316ffeb17ed92295ca4e16c0df9b62123
parent 37961b1922d7abcdad8849e4cbab9b7fda8066d0

Add ignore limits flag and use for sync request

Letting sync request ignore the socket and group limits when
loading to prevent the WebCore thread from locking up.

BUG=45986,58703

TEST=No new tests

Review URL: http://codereview.chromium.org/6756004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79817 0039d316-1c4b-4281-b951-d872f2087c98

net/socket/ssl_client_socket_pool.cc

diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc
index cbd87af..8d470d2 100644
--- a/net/socket/ssl_client_socket_pool.cc
+++ b/net/socket/ssl_client_socket_pool.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -45,18 +45,21 @@
       DCHECK(tcp_params_.get() != NULL);
       DCHECK(http_proxy_params_.get() == NULL);
       DCHECK(socks_params_.get() == NULL);
+      ignore_limits_ = tcp_params_->ignore_limits();
       break;
     case ProxyServer::SCHEME_HTTP:
     case ProxyServer::SCHEME_HTTPS:
       DCHECK(tcp_params_.get() == NULL);
       DCHECK(http_proxy_params_.get() != NULL);
       DCHECK(socks_params_.get() == NULL);
+      ignore_limits_ = http_proxy_params_->ignore_limits();
       break;
     case ProxyServer::SCHEME_SOCKS4:
     case ProxyServer::SCHEME_SOCKS5:
       DCHECK(tcp_params_.get() == NULL);
       DCHECK(http_proxy_params_.get() == NULL);
       DCHECK(socks_params_.get() != NULL);
+      ignore_limits_ = socks_params_->ignore_limits();
       break;
     default:
       LOG(DFATAL) << "unknown proxy type";