Merge pull request #363 from dgolombek/wip/sni_fix

Fix SNI handling for JRuby
nahi · Feb 3, 2019 · fcbefca · fcbefca
2 parents 5cfed97 + 091b711
commit fcbefca
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/lib/httpclient/jruby_ssl_socket.rb b/lib/httpclient/jruby_ssl_socket.rb
@@ -555,8 +555,11 @@ def create_ssl_socket(socket, dest, config, opts)
       if socket
         ssl_socket = factory.createSocket(socket, dest.host, dest.port, true)
       else
-        ssl_socket = factory.createSocket
-        JavaSocketWrap.connect(ssl_socket, dest, opts)
+        # Create a plain socket first to set connection timeouts on,
+        # then wrap it in a SSL socket so that SNI gets setup on it.
+        socket = javax.net.SocketFactory.getDefault.createSocket
+        JavaSocketWrap.connect(socket, dest, opts)
+        ssl_socket = factory.createSocket(socket, dest.host, dest.port, true)
       end
       ssl_socket
     end