Skip to content
This repository was archived by the owner on Dec 18, 2018. It is now read-only.

Commit acca4ee

Browse files
author
Cesar Blum Silveira
committed
Inject IDefaultHttpsProvider in KestrelServer.
1 parent 7c50a29 commit acca4ee

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

src/Kestrel.Core/KestrelServer.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,21 @@ public class KestrelServer : IServer
3030
private int _stopping;
3131
private readonly TaskCompletionSource<object> _stoppedTcs = new TaskCompletionSource<object>();
3232

33-
public KestrelServer(IOptions<KestrelServerOptions> options, ITransportFactory transportFactory, ILoggerFactory loggerFactory)
34-
: this(transportFactory, CreateServiceContext(options, loggerFactory))
33+
public KestrelServer(IOptions<KestrelServerOptions> options, ITransportFactory transportFactory, ILoggerFactory loggerFactory, IDefaultHttpsProvider defaultHttpsProvider)
34+
: this(transportFactory, defaultHttpsProvider, CreateServiceContext(options, loggerFactory))
3535
{
3636
}
3737

3838
// For testing
39-
internal KestrelServer(ITransportFactory transportFactory, ServiceContext serviceContext)
39+
internal KestrelServer(ITransportFactory transportFactory, IDefaultHttpsProvider defaultHttpsProvider, ServiceContext serviceContext)
4040
{
4141
if (transportFactory == null)
4242
{
4343
throw new ArgumentNullException(nameof(transportFactory));
4444
}
4545

4646
_transportFactory = transportFactory;
47+
_defaultHttpsProvider = defaultHttpsProvider;
4748
ServiceContext = serviceContext;
4849

4950
var httpHeartbeatManager = new HttpHeartbeatManager(serviceContext.ConnectionManager);
@@ -54,8 +55,6 @@ internal KestrelServer(ITransportFactory transportFactory, ServiceContext servic
5455
Features = new FeatureCollection();
5556
_serverAddresses = new ServerAddressesFeature();
5657
Features.Set(_serverAddresses);
57-
58-
_defaultHttpsProvider = serviceContext.ServerOptions.ApplicationServices.GetService<IDefaultHttpsProvider>();
5958
}
6059

6160
private static ServiceContext CreateServiceContext(IOptions<KestrelServerOptions> options, ILoggerFactory loggerFactory)

0 commit comments

Comments
 (0)