Fix HTTP requests to IPv6 hosts (#11240)

ed544f31 · ThibG · Eugen Rochko · 0c1b1069 · ed544f31
Commit ed544f31 authored Jul 05, 2019 by ThibG Committed by Eugen Rochko Jul 05, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/lib/request.rb app/lib/request.rb +1 -1

No files found.
--- 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)