@@ -281,7 +281,7 @@ extension HTTPConnectionPool.ConnectionFactory {
281281 }
282282 let tlsEventHandler = TLSEventsHandler ( deadline: deadline)
283283
284- let sslServerHostname = self . key. connectionTarget . sslServerHostname
284+ let sslServerHostname = self . key. serverNameIndicator
285285 let sslContextFuture = self . sslContextCache. sslContext (
286286 tlsConfiguration: tlsConfig,
287287 eventLoop: channel. eventLoop,
@@ -434,7 +434,6 @@ extension HTTPConnectionPool.ConnectionFactory {
434434 }
435435 #endif
436436
437- let sslServerHostname = self . key. serverNameIndicatorOverride ?? self . key. connectionTarget. sslServerHostname
438437 let sslContextFuture = sslContextCache. sslContext (
439438 tlsConfiguration: tlsConfig,
440439 eventLoop: eventLoop,
@@ -449,7 +448,7 @@ extension HTTPConnectionPool.ConnectionFactory {
449448 let sync = channel. pipeline. syncOperations
450449 let sslHandler = try NIOSSLClientHandler (
451450 context: sslContext,
452- serverHostname: sslServerHostname
451+ serverHostname: self . key . serverNameIndicator
453452 )
454453 let tlsEventHandler = TLSEventsHandler ( deadline: deadline)
455454
@@ -488,6 +487,12 @@ extension Scheme {
488487 }
489488}
490489
490+ extension ConnectionPool . Key {
491+ var serverNameIndicator : String ? {
492+ serverNameIndicatorOverride ?? connectionTarget. sslServerHostname
493+ }
494+ }
495+
491496extension ConnectionTarget {
492497 fileprivate var sslServerHostname : String ? {
493498 switch self {
0 commit comments