undo rebased-over change

drbrain · Dec 4, 2024 · b53e9a7 · b53e9a7
1 parent 49d678c
commit b53e9a7
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/lib/net/http/persistent.rb b/lib/net/http/persistent.rb
@@ -651,13 +651,23 @@ def connection_for uri
 
       return yield connection
     rescue Errno::ECONNREFUSED
-      address = http.proxy_address || http.address
-      port    = http.proxy_port    || http.port
+      if http.proxy?
+        address = http.proxy_address
+        port    = http.proxy_port
+      else
+        address = http.address
+        port    = http.port
+      end
 
       raise Error, "connection refused: #{address}:#{port}"
     rescue Errno::EHOSTDOWN
-      address = http.proxy_address || http.address
-      port    = http.proxy_port    || http.port
+      if http.proxy?
+        address = http.proxy_address
+        port    = http.proxy_port
+      else
+        address = http.address
+        port    = http.port
+      end
 
       raise Error, "host down: #{address}:#{port}"
     ensure