diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-25 08:13:18 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-25 08:13:18 +0000 |
| commit | 2703953ca6763176932dee45674f59f76db22262 (patch) | |
| tree | 018bc3e1bfdb4dd95d5dcdecca7c4bfe0c0a14ba /version.h | |
| parent | 4ef48a781ad8519f8dfe4871336d25a84e62bcd2 (diff) | |
merge revision(s) 49096,51353,53168,53169: [Backport #11834]
test_m17n.rb: split test_scrub
* test/ruby/test_m17n.rb (TestM17N#test_scrub): split into some
tests.
* include/ruby/ruby.h: add raw FL macros, which assume always the
argument object is not a special constant.
* internal.h (STR_EMBED_P, STR_SHARED_P): valid only for T_STRING.
* string.c: deal with taint flags directly across String instances.
* transcode.c (rb_econv_substr_append, econv_primitive_convert):
the result should be infected by the original string.
* string.c (rb_str_scrub): the result should be infected by the
original string.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54260 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
| -rw-r--r-- | version.h | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,9 +1,9 @@ #define RUBY_VERSION "2.1.9" -#define RUBY_RELEASE_DATE "2016-02-25" -#define RUBY_PATCHLEVEL 457 +#define RUBY_RELEASE_DATE "2016-03-25" +#define RUBY_PATCHLEVEL 458 #define RUBY_RELEASE_YEAR 2016 -#define RUBY_RELEASE_MONTH 2 +#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_DAY 25 #include "ruby/version.h" |