archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-20 11:03:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 34499:

Browse source 
* test/pathname/test_pathname.rb: not read but binread.
	  patched by Benoit Daloze, [ruby-core:42440] [Bug #5984]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-02-08 22:31:55 +00:00
parent 42c6255260
commit 2bd2ea829f
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 @@
Thu Feb 9 07:28:43 2012 NARUSE, Yui <naruse@ruby-lang.org>
* test/pathname/test_pathname.rb: not read but binread.
patched by Benoit Daloze, [ruby-core:42440] [Bug #5984]
Wed Feb 8 22:29:59 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Feb 8 22:29:59 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_modify_expand): fix memory leak. * string.c (rb_str_modify_expand): fix memory leak.

2
test/pathname/test_pathname.rb
View file

@ -714,7 +714,7 @@ class TestPathname < Test::Unit::TestCase
def test_binread def test_binread
with_tmpchdir('rubytest-pathname') {|dir| with_tmpchdir('rubytest-pathname') {|dir|
open("a", "w") {|f| f.write "abc" } open("a", "w") {|f| f.write "abc" }
assert_equal("abc", Pathname("a").read) assert_equal("abc", Pathname("a").binread)
} }
end end

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3" #define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 69 #define RUBY_PATCHLEVEL 70
#define RUBY_RELEASE_DATE "2012-02-09" #define RUBY_RELEASE_DATE "2012-02-09"
#define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_YEAR 2012