merge revision(s) 53315: [Backport #11872]

* miniinit.c (Init_enc): add some common aliases of built-in
	  encodings.  [ruby-core:72481] [Bug #11872]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54712 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2016-04-22 15:26:53 +00:00
parent 69dc2ce664
commit dc4286a134
3 changed files with 10 additions and 2 deletions

View file

@ -1,3 +1,8 @@
Sat Apr 23 00:25:26 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* miniinit.c (Init_enc): add some common aliases of built-in
encodings. [ruby-core:72481] [Bug #11872]
Sat Apr 23 00:13:50 2016 sorah (Shota Fukumori) <her@sorah.jp>
* lib/forwardable.rb: Convert given accessors to String.

View file

@ -36,11 +36,14 @@ Init_enc_set_filesystem_encoding(void)
return rb_enc_to_index(rb_default_external_encoding());
}
void rb_encdb_declare(const char *name);
int rb_encdb_alias(const char *alias, const char *orig);
void
Init_enc(void)
{
void rb_encdb_declare(const char *name);
rb_encdb_declare("ASCII-8BIT");
rb_encdb_declare("US-ASCII");
rb_encdb_declare("UTF-8");
rb_encdb_alias("BINARY", "ASCII-8BIT");
rb_encdb_alias("ASCII", "US-ASCII");
}

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.0"
#define RUBY_RELEASE_DATE "2016-04-23"
#define RUBY_PATCHLEVEL 101
#define RUBY_PATCHLEVEL 102
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 4