Revert "Fix Ruby 2.7 support (mastodon#12831)"

This reverts commit 24cd212
and moves things back to local branch.

Author: zunda

Gemfile

@@ -56,7 +56,7 @@ gem 'hiredis', '~> 0.6'
 gem 'redis-namespace', '~> 1.7'
 gem 'health_check', git: 'https://github.com/ianheggie/health_check', ref: '0b799ead604f900ed50685e9b2d469cd2befba5b'
 gem 'htmlentities', '~> 4.3'
-gem 'http', '~> 4.3'
+gem 'http', '~> 3.3', git: 'https://github.com/zunda/http.git', branch: 'v3.3.0-use-ruby-2.7.0'
 gem 'http_accept_language', '~> 2.1'
 gem 'http_parser.rb', '~> 0.6', git: 'https://github.com/tmm1/http_parser.rb', ref: '54b17ba8c7d8d20a16dfc65d1775241833219cf2', submodules: true
 gem 'httplog', '~> 1.3'

Gemfile.lock

@@ -48,6 +48,17 @@ GIT
   specs:
     nilsimsa (1.1.2)
 
+GIT
+  remote: https://github.com/zunda/http.git
+  revision: 7734958c98b836bd06f27282be82e8697c93173b
+  branch: v3.3.0-use-ruby-2.7.0
+  specs:
+    http (3.3.0)
+      addressable (~> 2.3)
+      http-cookie (~> 1.0)
+      http-form_data (~> 2.0)
+      http_parser.rb (~> 0.6.0)
+
 GIT
   remote: https://github.com/zunda/sidekiq-scheduler.git
   revision: 761c0053240cbb7e0eff63938093147ffb6f8f3c
@@ -147,7 +158,7 @@ GEM
       rack (>= 0.9.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    blurhash (0.1.4)
+    blurhash (0.1.3)
       ffi (~> 1.10.0)
     brakeman (4.7.2)
     browser (2.7.1)
@@ -233,7 +244,7 @@ GEM
     discard (1.1.0)
       activerecord (>= 4.2, < 7)
     docile (1.3.2)
-    domain_name (0.5.20190701)
+    domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     doorkeeper (5.2.3)
       railties (>= 5)
@@ -266,9 +277,6 @@ GEM
     fast_blank (1.0.0)
     fastimage (2.1.7)
     ffi (1.10.0)
-    ffi-compiler (1.0.1)
-      ffi (>= 1.0.0)
-      rake
     fog-core (2.1.0)
       builder
       excon (~> 0.58)
@@ -292,9 +300,9 @@ GEM
       ffi (~> 1.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    goldfinger (2.1.1)
+    goldfinger (2.1.0)
       addressable (~> 2.5)
-      http (~> 4.0)
+      http (~> 3.0)
       nokogiri (~> 1.8)
       oj (~> 3.0)
     hamlit (2.11.0)
@@ -315,16 +323,9 @@ GEM
     hiredis (0.6.3)
     hkdf (0.3.0)
     htmlentities (4.3.4)
-    http (4.3.0)
-      addressable (~> 2.3)
-      http-cookie (~> 1.0)
-      http-form_data (~> 2.2)
-      http-parser (~> 1.2.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    http-form_data (2.2.0)
-    http-parser (1.2.1)
-      ffi-compiler (>= 1.0, < 2.0)
+    http-form_data (2.1.1)
     http_accept_language (2.1.1)
     httplog (1.3.3)
       rack (>= 1.0)
@@ -346,7 +347,7 @@ GEM
     iso-639 (0.2.8)
     jaro_winkler (1.5.4)
     jmespath (1.4.0)
-    json (2.3.0)
+    json (2.2.0)
     json-canonicalization (0.1.0)
     json-ld-preloaded (3.0.6)
       json-ld (~> 3.0)
@@ -741,7 +742,7 @@ DEPENDENCIES
   health_check!
   hiredis (~> 0.6)
   htmlentities (~> 4.3)
-  http (~> 4.3)
+  http (~> 3.3)!
   http_accept_language (~> 2.1)
   http_parser.rb (~> 0.6)!
   httplog (~> 1.3)

app/lib/request.rb

@@ -96,7 +96,7 @@ def valid_url?(url)
     end
 
     def http_client
-      HTTP.use(:auto_inflate).timeout(TIMEOUT.dup).follow(max_hops: 2)
+      HTTP.use(:auto_inflate).timeout(:per_operation, TIMEOUT.dup).follow(max_hops: 2)
     end
   end