summaryrefslogtreecommitdiffstats
path: root/net/http/http_proxy_client_socket_pool.cc
diff options
context:
space:
mode:
authorkristianm@google.com <kristianm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-30 13:00:20 +0000
committerkristianm@google.com <kristianm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-30 13:00:20 +0000
commit5acdce175d32ba915ac5933ae197e4fc59f7ec8f (patch)
tree453c421316ffeb17ed92295ca4e16c0df9b62123 /net/http/http_proxy_client_socket_pool.cc
parent37961b1922d7abcdad8849e4cbab9b7fda8066d0 (diff)
downloadchromium_src-5acdce175d32ba915ac5933ae197e4fc59f7ec8f.zip
chromium_src-5acdce175d32ba915ac5933ae197e4fc59f7ec8f.tar.gz
chromium_src-5acdce175d32ba915ac5933ae197e4fc59f7ec8f.tar.bz2
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
Diffstat (limited to 'net/http/http_proxy_client_socket_pool.cc')
-rw-r--r--net/http/http_proxy_client_socket_pool.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/http/http_proxy_client_socket_pool.cc b/net/http/http_proxy_client_socket_pool.cc
index 13d6286..39e899c 100644
--- a/net/http/http_proxy_client_socket_pool.cc
+++ b/net/http/http_proxy_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.
@@ -48,6 +48,10 @@ HttpProxySocketParams::HttpProxySocketParams(
tunnel_(tunnel) {
DCHECK((tcp_params == NULL && ssl_params != NULL) ||
(tcp_params != NULL && ssl_params == NULL));
+ if (tcp_params_)
+ ignore_limits_ = tcp_params->ignore_limits();
+ else
+ ignore_limits_ = ssl_params->ignore_limits();
}
const HostResolver::RequestInfo& HttpProxySocketParams::destination() const {