Skip to content

Commit

Permalink
Removed trailing whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
drbrain committed Feb 9, 2013
1 parent 2dd5f8b commit 7993cc9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/net/http/persistent.rb
Expand Up @@ -833,11 +833,11 @@ def proxy_from_env
env_no_proxy = ENV['no_proxy'] || ENV['NO_PROXY'] env_no_proxy = ENV['no_proxy'] || ENV['NO_PROXY']


# '*' is special case for always bypass # '*' is special case for always bypass
return nil if env_no_proxy == '*' return nil if env_no_proxy == '*'


if env_no_proxy then if env_no_proxy then
uri.query = "no_proxy=#{escape(env_no_proxy)}" uri.query = "no_proxy=#{escape(env_no_proxy)}"
end end


unless uri.user or uri.password then unless uri.user or uri.password then
uri.user = escape ENV['http_proxy_user'] || ENV['HTTP_PROXY_USER'] uri.user = escape ENV['http_proxy_user'] || ENV['HTTP_PROXY_USER']
Expand Down

0 comments on commit 7993cc9

Please sign in to comment.