summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--miniinit.c5
-rw-r--r--version.h2
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a4a678e27a..c4cf0ccfdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/miniinit.c b/miniinit.c
index b4bc4dd437..7284e2e62d 100644
--- a/miniinit.c
+++ b/miniinit.c
@@ -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");
}
diff --git a/version.h b/version.h
index 69160a4641..811838bd4c 100644
--- a/version.h
+++ b/version.h
@@ -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