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

merges r23976 from trunk into ruby_1_9_1.

Browse source 
--
* io.c (rb_io_ext_int_to_encs): Set external encoding if
  ext==intern. [ruby-dev:38278]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24071 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-07-13 06:13:10 +00:00
parent d4c125db78
commit 75d8ae3f08
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 @@
Tue Jul 7 10:12:37 2009 NARUSE, Yui <naruse@ruby-lang.org>
* io.c (rb_io_ext_int_to_encs): Set external encoding if
ext==intern. [ruby-dev:38278]
Mon Jul 6 08:00:10 2009 Yukihiro Matsumoto <matz@ruby-lang.org> Mon Jul 6 08:00:10 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* enum.c (enum_to_a): should propagate taint to the return value. * enum.c (enum_to_a): should propagate taint to the return value.

2
io.c
View file

@ -3868,7 +3868,7 @@ rb_io_ext_int_to_encs(rb_encoding *ext, rb_encoding *intern, rb_encoding **enc,
intern = rb_default_internal_encoding(); intern = rb_default_internal_encoding();
if (intern == NULL || intern == (rb_encoding *)Qnil || intern == ext) { if (intern == NULL || intern == (rb_encoding *)Qnil || intern == ext) {
/* No internal encoding => use external + no transcoding */ /* No internal encoding => use external + no transcoding */
*enc = default_ext ? NULL : ext; *enc = (default_ext && intern != ext) ? NULL : ext;
*enc2 = NULL; *enc2 = NULL;
} }
else { else {

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "1.9.1" #define RUBY_VERSION "1.9.1"
#define RUBY_RELEASE_DATE "2009-07-12" #define RUBY_RELEASE_DATE "2009-07-12"
#define RUBY_PATCHLEVEL 221 #define RUBY_PATCHLEVEL 222
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1