diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-15 19:02:10 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-15 19:02:10 +0000 |
| commit | 9b71251e1e8f86972df2c0eda7c4209c5da7488a (patch) | |
| tree | b6c48f35a415eccd80f4dfb59b0572caf7d617aa /ChangeLog | |
| parent | 243d224f285c8a4a5e4db344e2f4d4023cf8d2e9 (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_3@55905 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 03:51:59 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 03:41:21 2016 Kazuki Yamaguchi <k@rhe.jp> * ext/openssl/ossl_pkey_dh.c (ossl_dh_compute_key): Check that the DH |