diff options
author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-30 06:14:42 +0000 |
---|---|---|
committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-30 06:14:42 +0000 |
commit | 83e4330078a4f27a90a87e84f5cad95e1af9bb29 (patch) | |
tree | 31b342a44cbd2c00fadd5736e187c3320de7cbb1 /net/spdy/spdy_session.h | |
parent | ad5e75b7b631547499ebded471f8d02b7b91e81c (diff) | |
download | chromium_src-83e4330078a4f27a90a87e84f5cad95e1af9bb29.zip chromium_src-83e4330078a4f27a90a87e84f5cad95e1af9bb29.tar.gz chromium_src-83e4330078a4f27a90a87e84f5cad95e1af9bb29.tar.bz2 |
Revert 112130 - Close idle connections / SPDY sessions when needed.
Due to the idle connection state being held by different socket pools, it's possible for one socket pool to hold an idle socket in a lower layer socket pool. From the lower level socket pool's perspective, the socket is being "actively" used. From the higher socket pool's (including SpdySession, which is more of a connection manager) perspective, the connection is idle and can be closed if we have hit a limit.
Normally this isn't a big deal, except when we have a lot of idle SPDY connections and are connecting via a proxy, so we have low connection limits through the proxy server. We address this problem by allowing lower-level socket pools to tell higher level socket pools to close a socket.
BUG=62364,92244, 105839
TEST=none
Review URL: http://codereview.chromium.org/8340012
TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/8745007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112134 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_session.h')
-rw-r--r-- | net/spdy/spdy_session.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h index 1f21161..b5b7dc7 100644 --- a/net/spdy/spdy_session.h +++ b/net/spdy/spdy_session.h @@ -15,7 +15,6 @@ #include "base/gtest_prod_util.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" -#include "base/memory/weak_ptr.h" #include "base/task.h" #include "net/base/io_buffer.h" #include "net/base/load_states.h" @@ -46,8 +45,7 @@ class SpdyStream; class SSLInfo; class NET_EXPORT SpdySession : public base::RefCounted<SpdySession>, - public spdy::SpdyFramerVisitorInterface, - public LayeredPool { + public spdy::SpdyFramerVisitorInterface { public: // Create a new SpdySession. // |host_port_proxy_pair| is the host/port that this session connects to, and @@ -230,9 +228,6 @@ class NET_EXPORT SpdySession : public base::RefCounted<SpdySession>, int GetPeerAddress(AddressList* address) const; int GetLocalAddress(IPEndPoint* address) const; - // LayeredPool methods: - virtual bool CloseOneIdleConnection() OVERRIDE; - private: friend class base::RefCounted<SpdySession>; // Allow tests to access our innards for testing purposes. |