Skip to content

Commit 24cd212

Browse files
ClearlyClaireGargron
authored andcommitted
Fix Ruby 2.7 support (mastodon#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
1 parent a369d1c commit 24cd212

3 files changed

Lines changed: 17 additions & 12 deletions

File tree

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ gem 'hiredis', '~> 0.6'
5656
gem 'redis-namespace', '~> 1.7'
5757
gem 'health_check', git: 'https://github.com/ianheggie/health_check', ref: '0b799ead604f900ed50685e9b2d469cd2befba5b'
5858
gem 'htmlentities', '~> 4.3'
59-
gem 'http', '~> 3.3'
59+
gem 'http', '~> 4.3'
6060
gem 'http_accept_language', '~> 2.1'
6161
gem 'http_parser.rb', '~> 0.6', git: 'https://github.com/tmm1/http_parser.rb', ref: '54b17ba8c7d8d20a16dfc65d1775241833219cf2', submodules: true
6262
gem 'httplog', '~> 1.3'

Gemfile.lock

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ GEM
128128
rack (>= 0.9.0)
129129
binding_of_caller (0.8.0)
130130
debug_inspector (>= 0.0.1)
131-
blurhash (0.1.3)
131+
blurhash (0.1.4)
132132
ffi (~> 1.10.0)
133133
bootsnap (1.4.5)
134134
msgpack (~> 1.0)
@@ -216,7 +216,7 @@ GEM
216216
discard (1.1.0)
217217
activerecord (>= 4.2, < 7)
218218
docile (1.3.2)
219-
domain_name (0.5.20180417)
219+
domain_name (0.5.20190701)
220220
unf (>= 0.0.5, < 1.0.0)
221221
doorkeeper (5.2.3)
222222
railties (>= 5)
@@ -248,6 +248,9 @@ GEM
248248
fast_blank (1.0.0)
249249
fastimage (2.1.7)
250250
ffi (1.10.0)
251+
ffi-compiler (1.0.1)
252+
ffi (>= 1.0.0)
253+
rake
251254
fog-core (2.1.0)
252255
builder
253256
excon (~> 0.58)
@@ -271,9 +274,9 @@ GEM
271274
ffi (~> 1.0)
272275
globalid (0.4.2)
273276
activesupport (>= 4.2.0)
274-
goldfinger (2.1.0)
277+
goldfinger (2.1.1)
275278
addressable (~> 2.5)
276-
http (~> 3.0)
279+
http (~> 4.0)
277280
nokogiri (~> 1.8)
278281
oj (~> 3.0)
279282
hamlit (2.11.0)
@@ -294,14 +297,16 @@ GEM
294297
hiredis (0.6.3)
295298
hkdf (0.3.0)
296299
htmlentities (4.3.4)
297-
http (3.3.0)
300+
http (4.3.0)
298301
addressable (~> 2.3)
299302
http-cookie (~> 1.0)
300-
http-form_data (~> 2.0)
301-
http_parser.rb (~> 0.6.0)
303+
http-form_data (~> 2.2)
304+
http-parser (~> 1.2.0)
302305
http-cookie (1.0.3)
303306
domain_name (~> 0.5)
304-
http-form_data (2.1.1)
307+
http-form_data (2.2.0)
308+
http-parser (1.2.1)
309+
ffi-compiler (>= 1.0, < 2.0)
305310
http_accept_language (2.1.1)
306311
httplog (1.3.3)
307312
rack (>= 1.0)
@@ -323,7 +328,7 @@ GEM
323328
iso-639 (0.2.8)
324329
jaro_winkler (1.5.4)
325330
jmespath (1.4.0)
326-
json (2.2.0)
331+
json (2.3.0)
327332
json-canonicalization (0.1.0)
328333
json-ld-preloaded (3.0.6)
329334
json-ld (~> 3.0)
@@ -722,7 +727,7 @@ DEPENDENCIES
722727
health_check!
723728
hiredis (~> 0.6)
724729
htmlentities (~> 4.3)
725-
http (~> 3.3)
730+
http (~> 4.3)
726731
http_accept_language (~> 2.1)
727732
http_parser.rb (~> 0.6)!
728733
httplog (~> 1.3)

app/lib/request.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def valid_url?(url)
9696
end
9797

9898
def http_client
99-
HTTP.use(:auto_inflate).timeout(:per_operation, TIMEOUT.dup).follow(max_hops: 2)
99+
HTTP.use(:auto_inflate).timeout(TIMEOUT.dup).follow(max_hops: 2)
100100
end
101101
end
102102

0 commit comments

Comments
 (0)