summaryrefslogtreecommitdiffstats
path: root/net/socket
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-16 23:16:52 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-16 23:16:52 +0000
commitb5fdcaa11f061d4ef3a21cc5d5b99e51d155c65a (patch)
tree1f56c61a548831a6d6604a850f96a8359f706993 /net/socket
parent1e4c079f6e0059805c9f7c2b50fd75b3c27b55ff (diff)
downloadchromium_src-b5fdcaa11f061d4ef3a21cc5d5b99e51d155c65a.zip
chromium_src-b5fdcaa11f061d4ef3a21cc5d5b99e51d155c65a.tar.gz
chromium_src-b5fdcaa11f061d4ef3a21cc5d5b99e51d155c65a.tar.bz2
Flush all nested pools.
BUG=none TEST=none Review URL: http://codereview.chromium.org/3434006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59751 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
-rw-r--r--net/socket/socks_client_socket_pool.cc1
-rw-r--r--net/socket/ssl_client_socket_pool.cc6
2 files changed, 7 insertions, 0 deletions
diff --git a/net/socket/socks_client_socket_pool.cc b/net/socket/socks_client_socket_pool.cc
index 60f8665..b2a15a2 100644
--- a/net/socket/socks_client_socket_pool.cc
+++ b/net/socket/socks_client_socket_pool.cc
@@ -219,6 +219,7 @@ void SOCKSClientSocketPool::ReleaseSocket(const std::string& group_name,
void SOCKSClientSocketPool::Flush() {
base_.Flush();
+ tcp_pool_->Flush();
}
void SOCKSClientSocketPool::CloseIdleSockets() {
diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc
index 98fa93c..e1e4cb9 100644
--- a/net/socket/ssl_client_socket_pool.cc
+++ b/net/socket/ssl_client_socket_pool.cc
@@ -493,6 +493,12 @@ void SSLClientSocketPool::ReleaseSocket(const std::string& group_name,
void SSLClientSocketPool::Flush() {
base_.Flush();
+ if (http_proxy_pool_)
+ http_proxy_pool_->Flush();
+ if (socks_pool_)
+ socks_pool_->Flush();
+ if (tcp_pool_)
+ tcp_pool_->Flush();
}
void SSLClientSocketPool::CloseIdleSockets() {