summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-03-07 16:22:18 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-03-07 16:22:18 +0000
commit2eaf13a58c9af5c3145a809ced0806d1fb0b7a8f (patch)
tree0b4df9c6156857be552bcc4e0e34d865339db469
parent7db256b9fb9dc6e5c634eeff63714f5537a7c5ec (diff)
downloadruby-2eaf13a58c9af5c3145a809ced0806d1fb0b7a8f.tar.gz
ruby-2eaf13a58c9af5c3145a809ced0806d1fb0b7a8f.tar.xz
ruby-2eaf13a58c9af5c3145a809ced0806d1fb0b7a8f.zip
* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.66
fixed: [ruby-dev:25828] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8109 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/nkf/nkf-utf8/nkf.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bcd50104a..57f3832e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Mar 8 01:19:00 2005 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/nkf/nkf-utf8/nkf.c: follow nkf 1.66
+ fixed: [ruby-dev:25828]
+
Mon Mar 7 21:29:40 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/server.rb (WEBrick::GenericServer#start): should
diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c
index f3470136e..20cbbab88 100644
--- a/ext/nkf/nkf-utf8/nkf.c
+++ b/ext/nkf/nkf-utf8/nkf.c
@@ -1249,7 +1249,7 @@ options(cp)
}
continue;
case 'm': /* MIME support */
- mime_decode_f = TRUE;
+ /* mime_decode_f = TRUE; */ /* this has too large side effects... */
if (*cp=='B'||*cp=='Q') {
mime_decode_mode = *cp++;
mimebuf_f = FIXED_MIME;
@@ -1258,6 +1258,7 @@ options(cp)
} else if (*cp=='S') {
mime_f = STRICT_MIME; cp++;
} else if (*cp=='0') {
+ mime_decode_f = FALSE;
mime_f = FALSE; cp++;
}
continue;