diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-16 11:39:21 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-16 11:39:21 +0000 |
| commit | b76d7afffc5f455bbe1b3fac95ed8f2c4a26fe42 (patch) | |
| tree | 0a244ca3c43c9edd11d37c6a4278f5f43cdbf1c8 /ChangeLog | |
| parent | ef62988ecce58edc1ffbd6aa70ffd328a03b0923 (diff) | |
merge revision(s) 55181: [Backport #12431]
* transcode.c (str_transcode0): scrub in the given encoding when
the source encoding is given, not in the encoding of the
receiver. [ruby-core:75732] [Bug #12431]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Tue Aug 16 20:34:22 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * transcode.c (str_transcode0): scrub in the given encoding when + the source encoding is given, not in the encoding of the + receiver. [ruby-core:75732] [Bug #12431] + Tue Aug 16 20:30:53 2016 Kazuki Yamaguchi <k@rhe.jp> * ext/openssl/ossl_pkey_dh.c (ossl_dh_compute_key): Check that the DH |