Fix RequestToActiveConnectionIdKillsPreviousConnectionLongPolling

Author: halter73

src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs

@@ -223,8 +223,6 @@ private async Task ExecuteAsync(HttpContext context, ConnectionDelegate connecti
 
                 try
                 {
-                    var pollAgain = true;
-
                     // If the application ended before the transport task then we potentially need to end the connection
                     if (resultTask == connection.ApplicationTask)
                     {
@@ -243,9 +241,11 @@ private async Task ExecuteAsync(HttpContext context, ConnectionDelegate connecti
                             // We should be able to safely dispose because there's no more data being written
                             // We don't need to wait for close here since we've already waited for both sides
                             await _manager.DisposeAndRemoveAsync(connection, closeGracefully: false);
-
-                            // Don't poll again if we've removed the connection completely
-                            pollAgain = false;
+                        }
+                        else
+                        {
+                            // Only allow repoll if we aren't removing the connection.
+                            connection.MarkInactive();
                         }
                     }
                     else if (resultTask.IsFaulted)
@@ -255,17 +255,10 @@ private async Task ExecuteAsync(HttpContext context, ConnectionDelegate connecti
 
                         // transport task was faulted, we should remove the connection
                         await _manager.DisposeAndRemoveAsync(connection, closeGracefully: false);
-
-                        pollAgain = false;
-                    }
-                    else if (context.Response.StatusCode == StatusCodes.Status204NoContent)
-                    {
-                        // Don't poll if the transport task was canceled
-                        pollAgain = false;
                     }
-
-                    if (pollAgain)
+                    else
                     {
+                        // Only allow repoll if we aren't removing the connection.
                         connection.MarkInactive();
                     }
                 }

src/SignalR/common/Http.Connections/src/Internal/Transports/LongPollingTransport.cs

@@ -60,7 +60,7 @@ public async Task ProcessRequestAsync(HttpContext context, CancellationToken tok
             {
                 // 3 cases:
                 // 1 - Request aborted, the client disconnected (no response)
-                // 2 - The poll timeout is hit (204)
+                // 2 - The poll timeout is hit (200)
                 // 3 - A new request comes in and cancels this request (204)
 
                 // Case 1