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

* transcode.c (str_transcode0): fix: :xml option doesn't

work on str.encode([options]) form without default_internal.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21649 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2009-01-18 18:32:24 +00:00
parent db881044bc
commit 69ee4246e5
3 changed files with 9 additions and 3 deletions

View file

@ -1,3 +1,8 @@
Mon Jan 19 03:06:22 2009 NARUSE, Yui <naruse@ruby-lang.org>
* transcode.c (str_transcode0): fix: :xml option doesn't
work on str.encode([options]) form without default_internal.
Sun Jan 18 16:56:46 2009 Tanaka Akira <akr@fsij.org> Sun Jan 18 16:56:46 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/raddrinfo.c (addrinfo_inspect_sockaddr): new * ext/socket/raddrinfo.c (addrinfo_inspect_sockaddr): new

View file

@ -2457,7 +2457,8 @@ str_transcode0(int argc, VALUE *argv, VALUE *self, int ecflags, VALUE ecopts)
if (argc == 0) { if (argc == 0) {
arg1 = rb_enc_default_internal(); arg1 = rb_enc_default_internal();
if (NIL_P(arg1)) { if (NIL_P(arg1)) {
return -1; if (!ecflags) return -1;
arg1 = rb_obj_encoding(str);
} }
ecflags |= ECONV_INVALID_REPLACE | ECONV_UNDEF_REPLACE; ecflags |= ECONV_INVALID_REPLACE | ECONV_UNDEF_REPLACE;
} }

View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1" #define RUBY_VERSION "1.9.1"
#define RUBY_RELEASE_DATE "2009-01-18" #define RUBY_RELEASE_DATE "2009-01-19"
#define RUBY_PATCHLEVEL 5000 #define RUBY_PATCHLEVEL 5000
#define RUBY_BRANCH_NAME "trunk" #define RUBY_BRANCH_NAME "trunk"
@ -8,7 +8,7 @@
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 1 #define RUBY_RELEASE_MONTH 1
#define RUBY_RELEASE_DAY 18 #define RUBY_RELEASE_DAY 19
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];