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

Merge pull request #3178 from dotnet-maestro-bot/merge/release/2.2-to-master 

[automated] Merge branch 'release/2.2' => 'master'
This commit is contained in:
BrennanConroy 2018-10-23 09:17:41 -07:00 committed by GitHub
parent bd60f71cf9 63900a462b
commit dbbb759a8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clients/ts/signalr/src/NodeHttpClient.ts
View File

@ -2,6 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
import * as http from "http";
import * as https from "https";
import { URL } from "url";
import { AbortError, HttpError, TimeoutError } from "./Errors";
@ -33,7 +34,12 @@ export class NodeHttpClient extends HttpClient {
port: url.port,
};
const req = http.request(options, (res: http.IncomingMessage) => {
// "any" is used here because require() can't be correctly resolved by the compiler
// when httpOrHttps is typeof http | typeof https. Change to http when editing to get
// intellisense.
const httpOrHttps: any = url.protocol === "https" ? https : http;
const req = httpOrHttps.request(options, (res: http.IncomingMessage) => {
const data: Buffer[] = [];
let dataLength = 0;
res.on("data", (chunk: any) => {
@ -76,7 +82,7 @@ export class NodeHttpClient extends HttpClient {
});
}
req.on("error", (e) => {
req.on("error", (e: Error) => {
this.logger.log(LogLevel.Warning, `Error from HTTP request. ${e}`);
reject(e);
});

4
test/Microsoft.AspNetCore.SignalR.Tests/MapSignalRTests.cs
View File

@ -45,7 +45,8 @@ namespace Microsoft.AspNetCore.SignalR.Tests
Assert.Equal("Unable to find the required services. Please add all the required services by calling " +
"'IServiceCollection.AddSignalR' inside the call to 'ConfigureServices(...)' in the application startup code.", ex.Message);
});
})
.UseUrls("http://127.0.0.1:0");
using (var host = builder.Build())
{
@ -137,6 +138,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
{
app.UseSignalR(options => configure(options));
})
.UseUrls("http://127.0.0.1:0")
.Build();
}
}