From 5568d599ba0b0cba940c5550a298a64de439ce23 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Thu, 27 Jul 2017 11:00:58 +0200 Subject: [PATCH] Fixed issue #1292 - Don't use Proxy on localhost Addresses. --- lib/user_agent.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/user_agent.rb b/lib/user_agent.rb index 1f835840ad40..620fb04c47dc 100644 --- a/lib/user_agent.rb +++ b/lib/user_agent.rb @@ -264,7 +264,10 @@ def self.request(url, options = {}) def self.get_http(uri, options) proxy = options['proxy'] || Setting.get('proxy') - if proxy.present? + proxy_no = options['proxy_no'] || Setting.get('proxy_no') || '' + proxy_no = proxy_no.split(',').map(&:strip) || [] + proxy_no.push('localhost', '127.0.0.1', '::1') + if proxy.present? && !proxy_no.include?(uri.host.downcase) if proxy =~ /^(.+?):(.+?)$/ proxy_host = $1 proxy_port = $2