Binder fixes for 4.2.1

lib/puma/binder.rb

@@ -105,6 +105,7 @@ def parse(binds, logger)
             io = add_tcp_listener uri.host, uri.port, opt, bak
 
             @ios.each do |i|
+              next unless TCPServer === i
               addr = if i.local_address.ipv6?
                 "[#{i.local_address.ip_unpack[0]}]:#{i.local_address.ip_unpack[1]}"
               else

test/test_binder.rb

@@ -66,12 +66,38 @@ def test_correct_zero_port_ssl
     end
   end
 
-  def test_correct_doublebind
-    @binder.parse(["ssl://localhost:0?key=#{key}&cert=#{cert}", "tcp://localhost:0"], @events)
+  def test_allows_both_ssl_and_tcp
+    assert_parsing_logs_uri [:ssl, :tcp]
+  end
+
+  def test_allows_both_unix_and_tcp
+    assert_parsing_logs_uri [:unix, :tcp]
+  end
+
+  def test_allows_both_tcp_and_unix
+    assert_parsing_logs_uri [:tcp, :unix]
+  end
+
+  private
+
+  def assert_parsing_logs_uri(order = [:unix, :tcp])
+    skip UNIX_SKT_MSG if order.include?(:unix) && !UNIX_SKT_EXIST
+
+    prepared_paths = {
+        ssl: "ssl://127.0.0.1:#{UniquePort.call}?key=#{key}&cert=#{cert}",
+        tcp: "tcp://127.0.0.1:#{UniquePort.call}",
+        unix: "unix://test/#{name}_server.sock"
+      }
+
+    tested_paths = [prepared_paths[order[0]], prepared_paths[order[1]]]
 
+    @binder.parse(tested_paths, @events)
     stdout = @events.stdout.string
 
-    # Unsure of what to actually assert on here yet
+    assert stdout.include?(prepared_paths[order[0]]), "\n#{stdout}\n"
+    assert stdout.include?(prepared_paths[order[1]]), "\n#{stdout}\n"
+  ensure
+    @binder.close_unix_paths if order.include?(:unix) && UNIX_SKT_EXIST
   end
 end