1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* io.c (rb_io_extract_modeenc): set ASCII-8BIT if binmode is specified

Browse Source 
with opthash. [ruby-core:42197] [Bug #5917]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34358 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-01-23 07:56:20 +00:00
parent 4c9968c9d9
commit e7d83904cb
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon Jan 23 16:35:27 2012 NARUSE, Yui <naruse@ruby-lang.org>
* io.c (rb_io_extract_modeenc): set ASCII-8BIT if binmode is specified
with opthash. [ruby-core:42197] [Bug #5917]
Mon Jan 23 10:08:00 2012 Kenta Murata <mrkn@cookpad.com> Mon Jan 23 10:08:00 2012 Kenta Murata <mrkn@cookpad.com>
* test/cgi/test_cgi_util.rb (test_cgi_escape_preserve_encoding): * test/cgi/test_cgi_util.rb (test_cgi_escape_preserve_encoding):

5
io.c
View File

@ -4859,10 +4859,13 @@ rb_io_extract_modeenc(VALUE *vmode_p, VALUE *vperm_p, VALUE opthash,
else { else {
VALUE v; VALUE v;
extract_binmode(opthash, &fmode); extract_binmode(opthash, &fmode);
if (fmode & FMODE_BINMODE) {
#ifdef O_BINARY #ifdef O_BINARY
if (fmode & FMODE_BINMODE)
oflags |= O_BINARY; oflags |= O_BINARY;
#endif #endif
if (!has_enc)
rb_io_ext_int_to_encs(rb_ascii8bit_encoding(), NULL, &enc, &enc2);
}
if (!has_vmode) { if (!has_vmode) {
v = rb_hash_aref(opthash, sym_mode); v = rb_hash_aref(opthash, sym_mode);
if (!NIL_P(v)) { if (!NIL_P(v)) {

5
test/ruby/test_io_m17n.rb
View File

@ -1042,6 +1042,11 @@ EOT
f.set_encoding("iso-2022-jp") f.set_encoding("iso-2022-jp")
} }
} }
assert_nothing_raised {
open(__FILE__, "r", binmode: true) {|f|
f.set_encoding("iso-2022-jp")
}
}
end end
def test_write_conversion_fixenc def test_write_conversion_fixenc