Porting fix for Net::HTTP env proxy (Faraday #1221) (#2)

lostisland · Dec 25, 2020 · 790cb8b · 790cb8b
1 parent 3278e9d
commit 790cb8b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 103 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,8 +9,9 @@ spec/reports/
 tmp/
 
 *.gem
+gemfile.lock
 
 .rvmrc
 .ruby-version
 
-.rspec_status
+.rspec_status
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -11,8 +11,6 @@ Metrics/BlockLength:
   Exclude:
     - spec/**/*.rb
     - examples/**/*.rb
-Metrics/ClassLength:
-  Enabled: false
 Metrics/AbcSize:
   Max: 67
 Metrics/ClassLength:

diff --git a/.travis.yml b/.travis.yml
diff --git a/Gemfile.lock b/Gemfile.lock
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)