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

Remove HttpPlatformHandler port detection.

This commit is contained in:
Chris R 2016-01-12 11:42:36 -08:00
parent eb617eb9a9
commit 317c9d0e80
2 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Microsoft.AspNet.Hosting/Internal/WebApplication.cs
View File

@ -21,9 +21,6 @@ namespace Microsoft.AspNet.Hosting.Internal
{ {
public class WebApplication : IWebApplication public class WebApplication : IWebApplication
{ {
// This is defined by IIS's HttpPlatformHandler.
private static readonly string ServerPort = "HTTP_PLATFORM_PORT";
private readonly IServiceCollection _applicationServiceCollection; private readonly IServiceCollection _applicationServiceCollection;
private readonly IStartupLoader _startupLoader; private readonly IStartupLoader _startupLoader;
private readonly ApplicationLifetime _applicationLifetime; private readonly ApplicationLifetime _applicationLifetime;
@ -223,19 +220,10 @@ namespace Microsoft.AspNet.Hosting.Internal
Server = ServerFactory.CreateServer(_config); Server = ServerFactory.CreateServer(_config);
var addresses = Server.Features?.Get<IServerAddressesFeature>()?.Addresses; var addresses = Server.Features?.Get<IServerAddressesFeature>()?.Addresses;
if (addresses != null && !addresses.IsReadOnly) if (addresses != null && !addresses.IsReadOnly && addresses.Count == 0)
{ {
var port = _config[ServerPort];
if (!string.IsNullOrEmpty(port))
{
addresses.Add("http://localhost:" + port);
}
// Provide a default address if there aren't any configured. // Provide a default address if there aren't any configured.
if (addresses.Count == 0) addresses.Add("http://localhost:5000");
{
addresses.Add("http://localhost:5000");
}
} }
} }
} }

18
test/Microsoft.AspNet.Hosting.Tests/WebApplicationTests.cs
View File

@ -106,24 +106,6 @@ namespace Microsoft.AspNet.Hosting
Assert.NotNull(application.Services.GetService<IHostingEnvironment>()); Assert.NotNull(application.Services.GetService<IHostingEnvironment>());
} }
[Fact]
public void CanSpecifyPortConfig()
{
var vals = new Dictionary<string, string>
{
{ "Server", "Microsoft.AspNet.Hosting.Tests" },
{ "HTTP_PLATFORM_PORT", "abc123" }
};
var builder = new ConfigurationBuilder()
.AddInMemoryCollection(vals);
var config = builder.Build();
var application = CreateBuilder(config).Build();
application.Start();
Assert.NotNull(application.Services.GetService<IHostingEnvironment>());
Assert.Equal("http://localhost:abc123", application.ServerFeatures.Get<IServerAddressesFeature>().Addresses.First());
}
[Fact] [Fact]
public void CanDefaultAddresseIfNotConfigured() public void CanDefaultAddresseIfNotConfigured()
{ {