From e284370ddfc90f7f41d11e83e989ffd71087e273 Mon Sep 17 00:00:00 2001 From: Mattia Giuffrida Date: Wed, 23 Dec 2020 17:32:38 +0000 Subject: [PATCH] Porting of https://github.com/lostisland/faraday/pull/1221 --- Gemfile.lock | 2 +- lib/faraday/adapter/net_http.rb | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 58f9b52..e8adfe4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,7 +12,7 @@ GEM crack (0.4.4) diff-lcs (1.4.4) docile (1.3.2) - faraday (1.1.0) + faraday (1.2.0) multipart-post (>= 1.2, < 3) ruby2_keywords hashdiff (1.0.1) diff --git a/lib/faraday/adapter/net_http.rb b/lib/faraday/adapter/net_http.rb index 34fee08..23b33a7 100644 --- a/lib/faraday/adapter/net_http.rb +++ b/lib/faraday/adapter/net_http.rb @@ -48,14 +48,15 @@ def build_connection(env) end def net_http_connection(env) - klass = if (proxy = env[:request][:proxy]) - Net::HTTP::Proxy(proxy[:uri].hostname, proxy[:uri].port, - proxy[:user], proxy[:password]) - else - Net::HTTP - end + proxy = env[:request][:proxy] port = env[:url].port || (env[:url].scheme == 'https' ? 443 : 80) - klass.new(env[:url].hostname, port) + if proxy + Net::HTTP.new(env[:url].hostname, port, + proxy[:uri].hostname, proxy[:uri].port, + proxy[:user], proxy[:password]) + else + Net::HTTP.new(env[:url].hostname, port, nil) + end end def call(env)