From 24cd2126c6cfb80844ef9ffbf61647b3d9afdc68 Mon Sep 17 00:00:00 2001 From: ThibG Date: Sun, 12 Jan 2020 15:49:30 +0100 Subject: [PATCH] Fix Ruby 2.7 support (#12831) - update http gem to avoid errors - update blurhash gem to avoid shared object loading error - update goldfinger gem so the http gem could be updated - update json gem to avoid warnings --- Gemfile | 2 +- Gemfile.lock | 25 +++++++++++++++---------- app/lib/request.rb | 2 +- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Gemfile b/Gemfile index f0adf610c1a..316ebb81db9 100644 --- a/Gemfile +++ b/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', '~> 3.3' +gem 'http', '~> 4.3' 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' diff --git a/Gemfile.lock b/Gemfile.lock index a14b6ec936f..44682002af5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -128,7 +128,7 @@ GEM rack (>= 0.9.0) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - blurhash (0.1.3) + blurhash (0.1.4) ffi (~> 1.10.0) bootsnap (1.4.5) msgpack (~> 1.0) @@ -216,7 +216,7 @@ GEM discard (1.1.0) activerecord (>= 4.2, < 7) docile (1.3.2) - domain_name (0.5.20180417) + domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) doorkeeper (5.2.3) railties (>= 5) @@ -248,6 +248,9 @@ 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) @@ -271,9 +274,9 @@ GEM ffi (~> 1.0) globalid (0.4.2) activesupport (>= 4.2.0) - goldfinger (2.1.0) + goldfinger (2.1.1) addressable (~> 2.5) - http (~> 3.0) + http (~> 4.0) nokogiri (~> 1.8) oj (~> 3.0) hamlit (2.11.0) @@ -294,14 +297,16 @@ GEM hiredis (0.6.3) hkdf (0.3.0) htmlentities (4.3.4) - http (3.3.0) + http (4.3.0) addressable (~> 2.3) http-cookie (~> 1.0) - http-form_data (~> 2.0) - http_parser.rb (~> 0.6.0) + http-form_data (~> 2.2) + http-parser (~> 1.2.0) http-cookie (1.0.3) domain_name (~> 0.5) - http-form_data (2.1.1) + http-form_data (2.2.0) + http-parser (1.2.1) + ffi-compiler (>= 1.0, < 2.0) http_accept_language (2.1.1) httplog (1.3.3) rack (>= 1.0) @@ -323,7 +328,7 @@ GEM iso-639 (0.2.8) jaro_winkler (1.5.4) jmespath (1.4.0) - json (2.2.0) + json (2.3.0) json-canonicalization (0.1.0) json-ld-preloaded (3.0.6) json-ld (~> 3.0) @@ -722,7 +727,7 @@ DEPENDENCIES health_check! hiredis (~> 0.6) htmlentities (~> 4.3) - http (~> 3.3) + http (~> 4.3) http_accept_language (~> 2.1) http_parser.rb (~> 0.6)! httplog (~> 1.3) diff --git a/app/lib/request.rb b/app/lib/request.rb index d82bbb075fd..c476e7785bd 100644 --- a/app/lib/request.rb +++ b/app/lib/request.rb @@ -96,7 +96,7 @@ class Request end def http_client - HTTP.use(:auto_inflate).timeout(:per_operation, TIMEOUT.dup).follow(max_hops: 2) + HTTP.use(:auto_inflate).timeout(TIMEOUT.dup).follow(max_hops: 2) end end