forked from Gitlink/forgeplus
fix bug #484
|
|
@ -5,7 +5,7 @@ require 'uri'
|
|||
proxy_env = ENV['http_proxy'] || ENV['HTTP_PROXY']
|
||||
|
||||
if proxy_env && !proxy_env.strip.empty?
|
||||
proxy_uri = URI.parse(proxy_env)
|
||||
PROXY_URI = URI.parse(proxy_env)
|
||||
|
||||
class Net::HTTP
|
||||
class << self
|
||||
|
|
@ -14,10 +14,10 @@ if proxy_env && !proxy_env.strip.empty?
|
|||
def new(address, port = nil, *args)
|
||||
# 如果用户已经手动传了 proxy 参数,保持原样
|
||||
if args.empty?
|
||||
proxy_host = proxy_uri.host
|
||||
proxy_port = proxy_uri.port
|
||||
proxy_user = proxy_uri.user
|
||||
proxy_pass = proxy_uri.password
|
||||
proxy_host = PROXY_URI.host
|
||||
proxy_port = PROXY_URI.port
|
||||
proxy_user = PROXY_URI.user
|
||||
proxy_pass = PROXY_URI.password
|
||||
original_new(address, port, proxy_host, proxy_port, proxy_user, proxy_pass)
|
||||
else
|
||||
original_new(address, port, *args)
|
||||
|
|
|
|||
Loading…
Reference in New Issue