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

Set PreferHostingUrls when IIS adding override address

This commit is contained in:
John Luo 2017-04-08 20:49:26 -07:00
parent 687ff27beb
commit ce3c71b5b3
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
@ -52,6 +52,7 @@ namespace Microsoft.AspNetCore.Hosting
{ {
// Delay register the url so users don't accidently overwrite it. // Delay register the url so users don't accidently overwrite it.
hostBuilder.UseSetting(WebHostDefaults.ServerUrlsKey, address); hostBuilder.UseSetting(WebHostDefaults.ServerUrlsKey, address);
hostBuilder.PreferHostingUrls(true);
services.AddSingleton<IStartupFilter>(new IISSetupFilter(pairingToken, new PathString(path))); services.AddSingleton<IStartupFilter>(new IISSetupFilter(pairingToken, new PathString(path)));
services.Configure<ForwardedHeadersOptions>(options => services.Configure<ForwardedHeadersOptions>(options =>
{ {

6
test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISMiddlewareTests.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Net; using System.Net;
@ -72,7 +72,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration
} }
[Fact] [Fact]
public void UrlDelayRegistered() public void UrlDelayRegisteredAndPreferHostingUrlsSet()
{ {
var builder = new WebHostBuilder() var builder = new WebHostBuilder()
.UseSetting("TOKEN", "TestToken") .UseSetting("TOKEN", "TestToken")
@ -85,11 +85,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration
}); });
Assert.Null(builder.GetSetting(WebHostDefaults.ServerUrlsKey)); Assert.Null(builder.GetSetting(WebHostDefaults.ServerUrlsKey));
Assert.Null(builder.GetSetting(WebHostDefaults.PreferHostingUrls));
// Adds a server and calls Build() // Adds a server and calls Build()
var server = new TestServer(builder); var server = new TestServer(builder);
Assert.Equal("http://localhost:12345", builder.GetSetting(WebHostDefaults.ServerUrlsKey)); Assert.Equal("http://localhost:12345", builder.GetSetting(WebHostDefaults.ServerUrlsKey));
Assert.Equal("true", builder.GetSetting(WebHostDefaults.PreferHostingUrls));
} }
[Fact] [Fact]