Merge pull request #1343 from vicancy/v1.9.1

V1.9.1
Azure · Jul 6, 2021 · 3092473 · 3092473
2 parents 9fd52b9 + 95ba90f
commit 3092473
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/src/Microsoft.Azure.SignalR.Common/ServiceConnections/Internal/WebSocketsTransport.cs b/src/Microsoft.Azure.SignalR.Common/ServiceConnections/Internal/WebSocketsTransport.cs
@@ -9,7 +9,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
 
 namespace Microsoft.Azure.SignalR.Connections.Client.Internal
 {

diff --git a/src/Microsoft.Azure.SignalR.Common/Utilities/RestClient.cs b/src/Microsoft.Azure.SignalR.Common/Utilities/RestClient.cs
@@ -148,7 +148,6 @@ private HttpRequestMessage GenerateHttpRequest(string url, IDictionary<string, S
         {
             var request = new HttpRequestMessage(httpMethod, GetUri(url, query));
             request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", tokenString);
-            request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
             request.Headers.Add(Constants.AsrsUserAgent, productInfo);
             request.Content = new StringContent(JsonConvert.SerializeObject(payload, _jsonSerializerSettings), Encoding.UTF8, "application/json");
             return request;

diff --git a/src/Microsoft.Azure.SignalR/ServerConnections/ServiceConnection.cs b/src/Microsoft.Azure.SignalR/ServerConnections/ServiceConnection.cs
@@ -151,8 +151,9 @@ protected override Task OnClientDisconnectedAsync(CloseConnectionMessage closeCo
                 {
                     context.Features.Set<IConnectionMigrationFeature>(new ConnectionMigrationFeature(ServerId, to));
                     // We have to prevent SignalR `{type: 7}` (close message) from reaching our client while doing migration.
-                    // Since all user-created messages will be sent to `ServiceConnection` directly.
+                    // Since all data messages will be sent to `ServiceConnection` directly.
                     // We can simply ignore all messages came from the application pipe.
+                    context.Application.Input.CancelPendingRead();
                 }
             }