Index: net/spdy/spdy_session_pool.cc |
=================================================================== |
--- net/spdy/spdy_session_pool.cc (revision 92397) |
+++ net/spdy/spdy_session_pool.cc (working copy) |
@@ -151,8 +151,19 @@ |
"session", (*spdy_session)->net_log().source()))); |
// Now we can initialize the session with the SSL socket. |
- return (*spdy_session)->InitializeWithSocket(connection, is_secure, |
- certificate_error_code); |
+ net::Error error = |
+ (*spdy_session)->InitializeWithSocket(connection, is_secure, |
+ certificate_error_code); |
+ // We have a new session. Lookup the IP addresses for this session so that |
+ // we can match future Sessions (potentially to different domains) which can |
+ // potentially be pooled with this one. |
+ if (error == net::OK && g_enable_ip_pooling) { |
+ // Get connected address from spdy_session. |
+ AddressList addresses; |
+ if ((*spdy_session)->GetPeerAddress(&addresses) == net::OK) |
+ AddAliases(addresses, host_port_proxy_pair); |
+ } |
+ return error; |
wtc
2011/07/14 02:30:40
Testing error == net::OK is too strict.
(*spdy_ses
|
} |
bool SpdySessionPool::HasSession( |
@@ -302,16 +313,6 @@ |
DCHECK(sessions_.find(pair) == sessions_.end()); |
SpdySessionPool::SpdySessionList* list = new SpdySessionList(); |
sessions_[pair] = list; |
- |
- // We have a new session. Lookup the IP addresses for this session so that |
- // we can match future Sessions (potentially to different domains) which can |
- // potentially be pooled with this one. |
- if (g_enable_ip_pooling) { |
- AddressList addresses; |
- if (LookupAddresses(host_port_proxy_pair, &addresses)) |
- AddAliases(addresses, host_port_proxy_pair); |
- } |
- |
return list; |
} |
@@ -353,17 +354,6 @@ |
void SpdySessionPool::AddAliases(const AddressList& addresses, |
const HostPortProxyPair& pair) { |
- // Note: it is possible to think of strange overlapping sets of ip addresses |
- // for hosts such that a new session can override the alias for an IP |
- // address that was previously aliased to a different host. This is probably |
- // undesirable, but seemingly unlikely and complicated to fix. |
- // Example: |
- // host1 = 1.1.1.1, 1.1.1.4 |
- // host2 = 1.1.1.4, 1.1.1.5 |
- // host3 = 1.1.1.3, 1.1.1.5 |
- // Creating session1 (to host1), creates an alias for host2 to host1. |
- // Creating session2 (to host3), overrides the alias for host2 to host3. |
- |
const addrinfo* address = addresses.head(); |
while (address) { |
IPEndPoint endpoint; |