Add IServerAddressesFeature support #4685
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Multiple IIS test failures? |
|
Yep, I missed something. But in general PR ready for review. |
Tratcher
requested changes
Dec 13, 2018
src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/BindingInformation.h
Outdated
Show resolved
Hide resolved
src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/BindingInformation.h
Outdated
Show resolved
Hide resolved
src/IISIntegration/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp
Outdated
Show resolved
Hide resolved
src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h
Outdated
Show resolved
Hide resolved
src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Core/IISServerSetupFilter.cs
Outdated
Show resolved
Hide resolved
src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISSetupFilter.cs
Outdated
Show resolved
Hide resolved
src/IISIntegration/test/WebSites/OutOfProcessWebSite/Startup.cs
Outdated
Show resolved
Hide resolved
|
Failures are AuthSamples tests |
Tratcher
reviewed
Dec 14, 2018
| @@ -84,6 +83,9 @@ public Task StartAsync<TContext>(IHttpApplication<TContext> application, Cancell | |||
|
|
|||
| _iisContextFactory = new IISContextFactory<TContext>(_memoryPool, application, _options, this, _logger); | |||
| _nativeApplication.RegisterCallbacks(_requestHandler, _shutdownHandler, _onDisconnect, _onAsyncCompletion, (IntPtr)_httpServerHandle, (IntPtr)_httpServerHandle); | |||
|
|
|||
| Features.Set<IServerAddressesFeature>(new ServerAddressesFeature(_options.ServerAddresses)); | |||
There was a problem hiding this comment.
Clarification: The IServerAddressesFeature should be created and set in the IServer constructor, but the addresses should not be added until Start.
https://github.com/aspnet/KestrelHttpServer/blob/5c1fcd664d39db8fe5c8e38052a3cc29f90322f6/src/Kestrel.Core/KestrelServer.cs#L50-L51
Yes this is a bit of an arbitrary limitation, but we don't want people to get different behavior in IIS vs selfhost.
src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/BindingInformation.h
Outdated
Show resolved
Hide resolved
|
|
||
| for (auto binding : bindings) | ||
| { | ||
| result += binding.QueryProtocol() + L"://" + binding.QueryHost() + L":" + binding.QueryPort() + basePath + L";"; |
There was a problem hiding this comment.
Is pathBase encoded or decoded here? e.g. if I have a space in my base path do I get ' ' or %20? The escaped form should be preferred in this url form.
There was a problem hiding this comment.
The host is likely in unicode, no?
src/IISIntegration/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h
Outdated
Show resolved
Hide resolved
src/IISIntegration/test/Common.FunctionalTests/Inprocess/FeatureCollectionTests.cs
Outdated
Show resolved
Hide resolved
pakrym
commented
Dec 17, 2018
src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/WebHostBuilderIISExtensions.cs
Outdated
Show resolved
Hide resolved
…lderIISExtensions.cs
Tratcher
reviewed
Dec 18, 2018
src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/BindingInformation.h
Outdated
Show resolved
Hide resolved
src/Servers/IIS/src/AspNetCoreModuleV2/CommonLib/BindingInformation.h
Outdated
Show resolved
Hide resolved
| else if (selectedPort != bindingPort) | ||
| { | ||
| // If there are multiple endpoints configured return empty port | ||
| return L""; |
There was a problem hiding this comment.
environmentvariablehelpers is checking for null, not empty string. Or is there a difference here?
src/Servers/IIS/src/Microsoft.AspNetCore.Server.IIS/Core/IISHttpServer.cs
Outdated
Show resolved
Hide resolved
src/Servers/IIS/src/Microsoft.AspNetCore.Server.IISIntegration/IISSetupFilter.cs
Outdated
Show resolved
Hide resolved
jkotalik
reviewed
Dec 18, 2018
src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h
Show resolved
Hide resolved
src/Servers/IIS/src/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp
Outdated
Show resolved
Hide resolved
src/Servers/IIS/test/testassets/Common.FunctionalTests/HttpsTests.cs
Outdated
Show resolved
Hide resolved
Tratcher
approved these changes
Dec 20, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #3843
This feature requires both new shim and new handler to work but is gracefully disabled otherwise.