Fixed ssl options mapping (#1912)

* Fixed ssl options mapping

* Added units test for ssl options mapping

---------

Co-authored-by: Vladimir <example@com>

Author: Vladimir-Frolov

Source/EasyNetQ.Tests/PersistentConnectionTests.cs

@@ -1,3 +1,4 @@
+using EasyNetQ.ConnectionString;
 using EasyNetQ.Persistent;
 using EasyNetQ.Tests.Mocking;
 using Microsoft.Extensions.Logging;
@@ -99,4 +100,28 @@ public async Task Should_establish_connection_when_persistent_connection_created
         connection.Status.State.Should().Be(PersistentConnectionState.Connected);
         await mockBuilder.ConnectionFactory.Received(1).CreateConnectionAsync(Arg.Any<IList<AmqpTcpEndpoint>>());
     }
+
+    [Fact]
+    public async Task Should_pass_ssl_servername_the_same_as_hostname()
+    {
+        var config = new ConnectionStringParser().Parse("host=test-host:5671;ssl=true");
+
+        await using var mockBuilder = new MockBuilder();
+        using var connection = new PersistentConnection(
+            PersistentConnectionType.Producer,
+            Substitute.For<ILogger<IPersistentConnection>>(),
+            config,
+            mockBuilder.ConnectionFactory,
+            mockBuilder.EventBus
+        );
+
+        connection.Status.State.Should().Be(PersistentConnectionState.NotInitialised);
+
+        await connection.CreateChannelAsync();
+
+        await mockBuilder.ConnectionFactory.Received(1)
+            .CreateConnectionAsync(Arg.Is<IList<AmqpTcpEndpoint>>(eps => eps.Single().Ssl.ServerName == eps.Single().HostName));
+
+        connection.Status.State.Should().Be(PersistentConnectionState.Connected);
+    }
 }

Source/EasyNetQ/Persistent/PersistentConnection.cs

@@ -203,7 +203,7 @@ private static SslOption NewSslForHost(SslOption option, string host) =>
             CertificateValidationCallback = option.CertificateValidationCallback,
             CheckCertificateRevocation = option.CheckCertificateRevocation,
             Enabled = option.Enabled,
-            ServerName = option.ServerName ?? host,
+            ServerName = string.IsNullOrEmpty(option.ServerName) ? host : option.ServerName,
             Version = option.Version,
         };
 }