huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2077 from aspnet/release/2.1 

Merge Release/2.1
This commit is contained in:
Mikael Mengistu 2018-04-18 18:58:54 +00:00 committed by GitHub
parent b3b5a13f2c d9272032d0
commit 92d8f854bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
clients/ts/signalr/src/HttpClient.ts
View File

@ -94,22 +94,15 @@ export class DefaultHttpClient extends HttpClient {
xhr.timeout = request.timeout; xhr.timeout = request.timeout;
} }
xhr.onreadystatechange = () => { xhr.onload = () => {
if (xhr.readyState === 4) { if (request.abortSignal) {
if (request.abortSignal) { request.abortSignal.onabort = null;
request.abortSignal.onabort = null; }
}
// Some browsers report xhr.status == 0 when the if (xhr.status >= 200 && xhr.status < 300) {
// response has been cut off or there's been a TCP FIN. resolve(new HttpResponse(xhr.status, xhr.statusText, xhr.response || xhr.responseText));
// Treat it like a 200 with no response. } else {
if (xhr.status === 0) { reject(new HttpError(xhr.statusText, xhr.status));
resolve(new HttpResponse(200, null, null));
} else if (xhr.status >= 200 && xhr.status < 300) {
resolve(new HttpResponse(xhr.status, xhr.statusText, xhr.response || xhr.responseText));
} else {
reject(new HttpError(xhr.statusText, xhr.status));
}
} }
}; };

2
src/Microsoft.AspNetCore.SignalR.Core/HubConnectionContext.cs
View File

@ -57,7 +57,7 @@ namespace Microsoft.AspNetCore.SignalR
public string UserIdentifier { get; set; } public string UserIdentifier { get; set; }
internal virtual IHubProtocol Protocol { get; set; } public virtual IHubProtocol Protocol { get; internal set; }
internal ExceptionDispatchInfo AbortException { get; private set; } internal ExceptionDispatchInfo AbortException { get; private set; }