kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) r44637: [Backport #9385]

Browse source 
* lib/open-uri.rb: Make proxy disabling working again.
	  Fixed by Christophe Philemotte.   [ruby-core:59650] [Bug #9385]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45014 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2014-02-16 17:02:51 +00:00
parent 9d6dd89400
commit c33a807643
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Mon Feb 17 02:00:36 2014 Tanaka Akira <akr@fsij.org>
* lib/open-uri.rb: Make proxy disabling working again.
Fixed by Christophe Philemotte. [ruby-core:59650] [Bug #9385]
Mon Feb 17 01:57:45 2014 Benoit Daloze <eregontp@gmail.com>
* range.c (Range#size): [DOC] improve description and add examples.

2
lib/open-uri.rb
View file

@ -288,7 +288,7 @@ module OpenURI
end
end
http = klass.new(target_host, target_port)
http = proxy ? klass.new(target_host, target_port) : klass.new(target_host, target_port, nil)
if target.class == URI::HTTPS
require 'net/https'
http.use_ssl = true

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2014-02-17"
#define RUBY_PATCHLEVEL 432
#define RUBY_PATCHLEVEL 433
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 2