sharpetronics/faraday
1
0
Fork 0
mirror of https://github.com/lostisland/faraday.git synced 2025-11-12 00:04:04 -05:00
Code Issues Projects Releases Wiki Activity

Cleanup Patron proxy integration

Browse Source
This commit is contained in:
Ezekiel Templin 2012-04-01 15:14:26 -04:00
parent 5facefebd9
commit d89952cebc
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/faraday/adapter/patron.rb
View File

@ -16,9 +16,9 @@ module Faraday
session.connect_timeout = req[:open_timeout] if req[:open_timeout]
if proxy = req[:proxy]
session.proxy = "http://#{proxy[:uri].host}:#{proxy[:uri].port}"
if proxy[:username] && proxy[:password]
session.proxy.insert(7, "#{proxy[:username]}:#{proxy[:password]}@")
session.proxy = proxy[:uri].to_s
if proxy[:user] && proxy[:password]
prepend_proxy_auth_string(proxy, session)
end
end
end
@ -46,5 +46,9 @@ module Faraday
end
end
end
def prepend_proxy_auth_string(proxy, session)
session.proxy.insert(7, "#{proxy[:user]}:#{proxy[:password]}@")
end
end
end