Skip to content

Fix closure in HttpConnectionPoolManager.StartMonitoringNetworkChanges #50487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 15, 2021
Merged

Fix closure in HttpConnectionPoolManager.StartMonitoringNetworkChanges #50487

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions ...aries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionPoolManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,17 +166,20 @@ public void StartMonitoringNetworkChanges()

// Monitor network changes to invalidate Alt-Svc headers.
// A weak reference is used to avoid NetworkChange.NetworkAddressChanged keeping a non-disposed connection pool alive.
var poolsRef = new WeakReference<ConcurrentDictionary<HttpConnectionKey, HttpConnectionPool>>(_pools);
NetworkAddressChangedEventHandler networkChangedDelegate = delegate
{
if (poolsRef.TryGetTarget(out ConcurrentDictionary<HttpConnectionKey, HttpConnectionPool>? pools))
NetworkAddressChangedEventHandler networkChangedDelegate;
{ // scope to avoid closure if _networkChangeCleanup != null
var poolsRef = new WeakReference<ConcurrentDictionary<HttpConnectionKey, HttpConnectionPool>>(_pools);
networkChangedDelegate = delegate
{
foreach (HttpConnectionPool pool in pools.Values)
if (poolsRef.TryGetTarget(out ConcurrentDictionary<HttpConnectionKey, HttpConnectionPool>? pools))
{
pool.OnNetworkChanged();
foreach (HttpConnectionPool pool in pools.Values)
{
pool.OnNetworkChanged();
}
}
}
};
};
}

var cleanup = new NetworkChangeCleanup(networkChangedDelegate);

Expand Down