Porting of lostisland/faraday#1221

lostisland · Dec 23, 2020 · e284370 · e284370
1 parent 3278e9d
commit e284370
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git 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
@@ -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)