From 61e689471f640689a5534e5ce9b463b6873a91ad Mon Sep 17 00:00:00 2001
From: Mikael Mengistu <mikaelm12@users.noreply.github.com>
Date: Wed, 5 Jun 2019 13:06:36 -0700
Subject: [PATCH] Propagate cancellation token IAsyncEnumerators (#10901)

---
 src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs | 2 +-
 src/SignalR/common/Shared/AsyncEnumerableAdapters.cs        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs b/src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs
index 0cde5b0dcc..98524d6d9a 100644
--- a/src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs
+++ b/src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs
@@ -1944,7 +1944,7 @@ namespace Microsoft.AspNetCore.SignalR.Client
 
             public async Task<ConnectionState> WaitForActiveConnectionAsync(string methodName, [CallerMemberName] string memberName = null, [CallerFilePath] string filePath = null, [CallerLineNumber] int lineNumber = 0)
             {
-                await WaitConnectionLockAsync();
+                await WaitConnectionLockAsync(methodName);
 
                 if (CurrentConnectionStateUnsynchronized == null || CurrentConnectionStateUnsynchronized.Stopping)
                 {
diff --git a/src/SignalR/common/Shared/AsyncEnumerableAdapters.cs b/src/SignalR/common/Shared/AsyncEnumerableAdapters.cs
index d997233e43..e1d722bcea 100644
--- a/src/SignalR/common/Shared/AsyncEnumerableAdapters.cs
+++ b/src/SignalR/common/Shared/AsyncEnumerableAdapters.cs
@@ -45,7 +45,7 @@ namespace Microsoft.AspNetCore.SignalR.Internal
 
             public IAsyncEnumerator<TResult> GetAsyncEnumerator(CancellationToken cancellationToken = default)
             {
-                var enumerator = _asyncEnumerable.GetAsyncEnumerator();
+                var enumerator = _asyncEnumerable.GetAsyncEnumerator(_cts.Token);
                 if (cancellationToken.CanBeCanceled)
                 {
                     var registration = cancellationToken.Register((ctsState) =>
@@ -53,7 +53,7 @@ namespace Microsoft.AspNetCore.SignalR.Internal
                         ((CancellationTokenSource)ctsState).Cancel();
                     }, _cts);
 
-                    return new CancelableEnumerator<TResult>(_asyncEnumerable.GetAsyncEnumerator(), registration);
+                    return new CancelableEnumerator<TResult>(enumerator, registration);
                 }
 
                 return enumerator;