HTTPCLIENT-2364: Fixed incorrect re-binding of the upgraded SSL socket to the HTTP connection by the #upgrade method of the DefaultHttpClientConnectionOperator

Author: ok2c

httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java

@@ -282,7 +282,7 @@ public void upgrade(
                 LOG.debug("{} upgrading to TLS {}:{}", ConnPoolSupport.getId(conn), tlsName.getHostName(), tlsName.getPort());
             }
             final SSLSocket upgradedSocket = tlsSocketStrategy.upgrade(socket, tlsName.getHostName(), tlsName.getPort(), attachment, context);
-            conn.bind(upgradedSocket);
+            conn.bind(upgradedSocket, socket);
             onAfterTlsHandshake(context, endpointHost);
             if (LOG.isDebugEnabled()) {
                 LOG.debug("{} upgraded to TLS {}:{}", ConnPoolSupport.getId(conn), tlsName.getHostName(), tlsName.getPort());

httpclient5/src/test/java/org/apache/hc/client5/http/impl/io/TestHttpClientConnectionOperator.java

@@ -252,7 +252,7 @@ void testUpgrade() throws Exception {
 
         connectionOperator.upgrade(conn, host, null, Timeout.ofMilliseconds(345), context);
 
-        Mockito.verify(conn).bind(upgradedSocket);
+        Mockito.verify(conn).bind(Mockito.eq(upgradedSocket), Mockito.any());
     }
 
     @Test