Fix HTTP requests to IPv6 hosts (#11240)

2019-07-05 22:03:00 +02:00 · 2019-07-05 22:03:00 +02:00 · ed544f3166
parent 0c1b1069c9
commit ed544f3166
1 changed files with 1 additions and 1 deletions
--- a/app/lib/request.rb
+++ b/app/lib/request.rb
@ -191,7 +191,7 @@ class Request
            begin
              raise Mastodon::HostValidationError if PrivateAddressCheck.private_address?(IPAddr.new(address.to_s))

-              sock     = ::Socket.new(::Socket::AF_INET, ::Socket::SOCK_STREAM, 0)
+              sock     = ::Socket.new(address.is_a?(Resolv::IPv6) ? ::Socket::AF_INET6 : ::Socket::AF_INET, ::Socket::SOCK_STREAM, 0)
              sockaddr = ::Socket.pack_sockaddr_in(port, address.to_s)

              sock.setsockopt(::Socket::IPPROTO_TCP, ::Socket::TCP_NODELAY, 1)