mirror of
https://github.com/lostisland/faraday.git
synced 2025-11-12 00:04:04 -05:00
Cleanup Patron proxy integration
This commit is contained in:
parent
5facefebd9
commit
d89952cebc
@ -16,9 +16,9 @@ module Faraday
|
|||||||
session.connect_timeout = req[:open_timeout] if req[:open_timeout]
|
session.connect_timeout = req[:open_timeout] if req[:open_timeout]
|
||||||
|
|
||||||
if proxy = req[:proxy]
|
if proxy = req[:proxy]
|
||||||
session.proxy = "http://#{proxy[:uri].host}:#{proxy[:uri].port}"
|
session.proxy = proxy[:uri].to_s
|
||||||
if proxy[:username] && proxy[:password]
|
if proxy[:user] && proxy[:password]
|
||||||
session.proxy.insert(7, "#{proxy[:username]}:#{proxy[:password]}@")
|
prepend_proxy_auth_string(proxy, session)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -46,5 +46,9 @@ module Faraday
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def prepend_proxy_auth_string(proxy, session)
|
||||||
|
session.proxy.insert(7, "#{proxy[:user]}:#{proxy[:password]}@")
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user