tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream

Browse Source 
Unlike upstream, kept the direct timeline endpoint, as it is still of use in
glitch-soc.
This commit is contained in:
Thibaut Girka
2019-07-07 13:49:31 +02:00
parent 47c30be8d8 c07cca4727
commit 7039dca12c
6 changed files with 13 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/request.rb
View File

@ -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)