summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-09-26 16:08:11 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-09-26 16:08:11 +0000
commitb5ad2a59511eeede20849ae2aecf1018f5571ff8 (patch)
treed43d5dcc1447465802452496444bbf48690e067f /ChangeLog
parentfe17a46edf43cac07432c1b5a32dd1a9fbe62f7e (diff)
merge revision(s) 42930: [Backport #8898]
* lib/uri/generic.rb (URI::Generic.find_proxy): return nil if http_proxy environment variable is empty string. [ruby-core:57140] [Bug #8898] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43062 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c1ab16e809..f20c030465 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Sep 27 01:02:59 2013 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/uri/generic.rb (URI::Generic.find_proxy): return nil if
+ http_proxy environment variable is empty string.
+ [ruby-core:57140] [Bug #8898]
+
Fri Sep 27 00:58:57 2013 Zachary Scott <e@zzak.io>
* lib/gserver.rb: [DOC] correct gserver.rb license [Bug #8913]