diff --git a/lib/rb/lib/thrift/transport/ssl_server_socket.rb b/lib/rb/lib/thrift/transport/ssl_server_socket.rb index ba8bfc90ade..a4481129153 100644 --- a/lib/rb/lib/thrift/transport/ssl_server_socket.rb +++ b/lib/rb/lib/thrift/transport/ssl_server_socket.rb @@ -57,8 +57,9 @@ def accept accepted_transport.handle = ssl_socket end ensure - # Thread#kill leaves $! nil, but marks the thread as aborting. - close_accepted_socket(ssl_socket) if transport.nil? || $! || Thread.current.status == "aborting" + # transport is assigned last, so it is still nil if an exception, Thread#kill, or Timeout + # interrupts accept before then. + close_accepted_socket(ssl_socket) if transport.nil? end def to_s diff --git a/lib/rb/spec/ssl_server_socket_spec.rb b/lib/rb/spec/ssl_server_socket_spec.rb index 1f31e6f5ef1..adbe1b22a17 100644 --- a/lib/rb/spec/ssl_server_socket_spec.rb +++ b/lib/rb/spec/ssl_server_socket_spec.rb @@ -220,6 +220,28 @@ stop_thread(accept_thread) end + it "returns an open transport when accept is called while handling an exception" do + server = build_server(client_timeout: 1) + accept_thread = Thread.new do + raise "caller error" + rescue + server.accept + end + tcp_client, ssl_client = connect_ssl_client(server) + ssl_client.write("ping") + + expect(accept_thread.join(1)).not_to be_nil + transport = accept_thread.value + expect(transport).to be_open + expect(transport.read(4)).to eq("ping") + ensure + transport&.close + ssl_client&.close + tcp_client&.close + server&.close + stop_thread(accept_thread) + end + it "supports resumed client-authenticated TLS sessions" do context = server_context context.verify_mode = OpenSSL::SSL::VERIFY_PEER | OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT