diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-22 15:39:27 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-22 15:39:27 +0000 |
commit | 9224427bb5a483bb383c755f33a1d80867a7aa16 (patch) | |
tree | df834b6b69304ef7c9829c49bec87a5c5890073f | |
parent | a8acc95f4c3b3b6ead0586139e4205326e0bc029 (diff) | |
download | ruby-9224427bb5a483bb383c755f33a1d80867a7aa16.tar.gz |
merge revision(s) 54423,54489: [Backport #12201] [Backport #12202]
* ext/nkf/nkf-utf8/nkf.c: Merge upstream 4f3edf80a0.
patched by Anton Sivakov [Bug #12201] [Bug #12202]
* ext/nkf/nkf-utf8/nkf.c (mime_putc): fix typo.
[Bug #12202] [ruby-core:74802]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54714 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | ext/nkf/nkf-utf8/nkf.c | 8 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 15 insertions, 5 deletions
@@ -1,3 +1,13 @@ +Sat Apr 23 00:33:04 2016 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/nkf/nkf-utf8/nkf.c (mime_putc): fix typo. + [Bug #12202] [ruby-core:74802] + +Sat Apr 23 00:33:04 2016 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/nkf/nkf-utf8/nkf.c: Merge upstream 4f3edf80a0. + patched by Anton Sivakov [Bug #12201] [Bug #12202] + Sat Apr 23 00:29:15 2016 NARUSE, Yui <naruse@ruby-lang.org> * lib/securerandom.rb (gen_random): to avoid blocking on Windows. diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c index 6cdb026341..3e46c33f7d 100644 --- a/ext/nkf/nkf-utf8/nkf.c +++ b/ext/nkf/nkf-utf8/nkf.c @@ -3834,8 +3834,8 @@ fold_conv(nkf_char c2, nkf_char c1) f_prev = c1; f_line = 0; fold_state = CR; - } else if ((f_prev == c1 && !fold_preserve_f) - || (f_prev == LF && fold_preserve_f) + } else if ((f_prev == c1) + || (f_prev == LF) ) { /* duplicate newline */ if (f_line) { f_line = 0; @@ -5436,8 +5436,8 @@ mime_putc(nkf_char c) mimeout_state.buf[mimeout_state.count++] = (char)c; if (mimeout_state.count>MIMEOUT_BUF_LENGTH) { eof_mime(); - for (i=0;i<mimeout_state.count;i++) { - (*o_mputc)(mimeout_state.buf[i]); + for (j=0;j<mimeout_state.count;j++) { + (*o_mputc)(mimeout_state.buf[j]); base64_count++; } mimeout_state.count = 0; @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.3.0" #define RUBY_RELEASE_DATE "2016-04-23" -#define RUBY_PATCHLEVEL 103 +#define RUBY_PATCHLEVEL 104 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 4 |