diff options
| -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 @@ +Fri Apr 22 18:22:15 2016 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/nkf/nkf-utf8/nkf.c (mime_putc): fix typo. + [Bug #12202] [ruby-core:74802] + +Fri Apr 22 18:22:15 2016 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/nkf/nkf-utf8/nkf.c: Merge upstream 4f3edf80a0. + patched by Anton Sivakov [Bug #12201] [Bug #12202] + Fri Apr 22 18:19:32 2016 Naotoshi Seo <sonots@gmail.com> * ext/date/date_core.c (datetime_to_time): preserve timezone info diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c index fcf95c41a5..b13f304f6a 100644 --- a/ext/nkf/nkf-utf8/nkf.c +++ b/ext/nkf/nkf-utf8/nkf.c @@ -3833,8 +3833,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; @@ -5435,8 +5435,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.2.5" #define RUBY_RELEASE_DATE "2016-04-22" -#define RUBY_PATCHLEVEL 309 +#define RUBY_PATCHLEVEL 310 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 4 |