From 7993cc9d857961bcfef3b5df43e66f5412970c0c Mon Sep 17 00:00:00 2001 From: Eric Hodel Date: Fri, 8 Feb 2013 16:42:01 -0800 Subject: [PATCH] Removed trailing whitespace --- lib/net/http/persistent.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/net/http/persistent.rb b/lib/net/http/persistent.rb index ab2035d..306b60d 100644 --- a/lib/net/http/persistent.rb +++ b/lib/net/http/persistent.rb @@ -833,11 +833,11 @@ def proxy_from_env env_no_proxy = ENV['no_proxy'] || ENV['NO_PROXY'] # '*' is special case for always bypass - return nil if env_no_proxy == '*' + return nil if env_no_proxy == '*' if env_no_proxy then uri.query = "no_proxy=#{escape(env_no_proxy)}" - end + end unless uri.user or uri.password then uri.user = escape ENV['http_proxy_user'] || ENV['HTTP_PROXY_USER']