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) 31667:

Browse source 
merge revision(s) 28080:

	* ext/zlib/zlib.c (zstream_append_input2): add RB_GC_GUARD.
	  This caused failure when test/csv is executed with GC.stress = true.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28080 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@31667 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@31714 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2011-05-23 04:49:42 +00:00
parent 396a07307e
commit 109ea6449e
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat May 21 07:33:54 2011 Yusuke Endoh <mame@tsg.ne.jp>
* ext/zlib/zlib.c (zstream_append_input2): add RB_GC_GUARD.
This caused failure when test/csv is executed with GC.stress = true.
Sat May 21 05:43:03 2011 URABE Shyouhei <shyouhei@ruby-lang.org>
* eval.c (rb_thread_atfork): When a ruby process forks, its random

3
ext/zlib/zlib.c
View file

@ -610,7 +610,8 @@ zstream_append_input(z, src, len)
}
#define zstream_append_input2(z,v)\
zstream_append_input((z), RSTRING(v)->ptr, RSTRING(v)->len)
RB_GC_GUARD(v),\
zstream_append_input((z), (Bytef*)RSTRING_PTR(v), RSTRING_LEN(v))
static void
zstream_discard_input(z, len)

2
version.h
View file

@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2011-05-23"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20110523
#define RUBY_PATCHLEVEL 345
#define RUBY_PATCHLEVEL 346
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8