summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-02-16tags branches/ruby_1_9_3@r34641 as v1_9_3_125v1_9_3_125naruse
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/tags/v1_9_3_125@34643 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-16* ext/dbm/extconf.rb: merge trunk's ext/dbm/extconf.rb andnaruse
related functions of lib/mkmf.rb. [Backport #6021] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34641 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-16merge revision(s) 32730:naruse
* configure.in (enable_pthread): use -pthread on OpenBSD without explicit option. patched by Jeremy Evans. [ruby-core:38572] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34640 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-16merge revision(s) 32731,32734,32738:naruse
------------------------------------------------------------------------ r32731 | naruse | 2011-07-29 16:17:35 +0900 (Fri, 29 Jul 2011) | 3 lines Use setrlimit(NOFILE,1) on OpenBSD. Because on OpenBSD it freezes if limit=0. ------------------------------------------------------------------------ git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34639 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-15merge revision(s) r32583:nagachika
* ChangeLog: fix typo git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34638 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-15merge revision(s) 34629,34630:naruse
* cont.c (rb_fiber_reset_root_local_storage): add a new function to restore rb_thread_t::local_storage. * cont.c (rb_obj_is_fiber): add a new function to tell finalizer to prevent fibers from destroy. * gc.c (rb_objspace_call_finalizer): don't sweep fibers at finalizing objspace. * internal.h (rb_fiber_reset_root_local_storage, rb_obj_is_fiber): add prototypes. * vm.c (ruby_vm_destruct): reset main thread's local_storage before free main thread. rb_thread_t::local_storage is replaced by fiber's local storage when forked from fiber, and it should be already freed when the fiber was destroyed. * test/ruby/test_fiber.rb (test_fork_from_fiber): add test for fork from fiber. when the fiber was destroyed. [ruby-core:41456] [Bug #5700] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34637 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-15merge revision(s) 34626,34627:naruse
* ext/fiddle/closure.c (callback): same as r34506. * ext/fiddle/closure.c (callback): deal with unsinged integers. [ruby-core:42458][Bug #5991][Bug #6022] * ext/fiddle/conversions.c (value_to_generic, generic_to_value): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34636 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-15* 2012-02-16svn
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34635 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-15merge revision(s) 34619:marcandre
* lib/ostruct.rb: Simplify and fix rdoc. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34634 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-15merge revision(s) 34261,34351:nobu
------------------------------------------------------------------------ r34261 | nobu | 2012-01-10 15:52:24 +0900 (Tue, 10 Jan 2012) | 2 lines * gc.c (HEAP_OBJ_LIMIT): suppress narrowing down warning from gcc 4.2. ------------------------------------------------------------------------ * include/ruby/ruby.h (FIXNUM_P): simple flag should be int. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34617 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-15merge revision(s) r34564:nobu
* vm_eval.c (check_funcall): Call respond_to? with matching arity for legacy single-argument implementations. [ruby-trunk - Bug #6000] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34616 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-15merge revision(s) r32855,r32857,r33493,r34554:nobu
* vm_eval.c (check_funcall): try respond_to? first if redefined. [Bug #5158] * test/ruby/test_object.rb: tests that respond_to? returns false. * vm_eval.c (check_funcall): set array elements one-by-one to fix compile error with Fujitsu C Compiler 5.6 on Solaris 10 on Sparc. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34615 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-15merge revision(s) 33866,33867:nobu
------------------------------------------------------------------------ r33866 | nobu | 2011-11-27 17:24:29 +0900 (Sun, 27 Nov 2011) | 1 line * configure.in: whitespace-cleanup. ------------------------------------------------------------------------ git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34611 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-14merge revision(s) 34555: [Backport #5786]naruse
* compile.c (defined_expr): guard the whole expression. [ruby-dev:45021][Bug#5786] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34607 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-14merge revision(s) 32712,32718,32719: [Backport #6014]naruse
* ext/dl/cfunc.c (dlcfunc_mark), ext/dl/cptr.c (dlptr_mark): workaround to mark wrapped object. this is not a true fix, because [Bug #4929] is caused by the interface design of DL. * ext/dl/cptr.c (rb_dlptr_s_to_ptr): fix wrapping condition. * ext/dl/cptr.c (rb_dlptr_s_to_ptr): fix wrapping condition. * ext/dl/cptr.c (rb_dlptr_s_to_ptr): use rb_check_funcall. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-14merge revision(s) 32720: [Backport #6015]naruse
* ext/dl/cptr.c (rb_dlptr_aref, rb_dlptr_aset): check NULL pointer dereference. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34603 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-14merge revision(s) 32705,32717: [Backport #6016]naruse
* test/rinda/test_rinda.rb (test_remote_array_and_hash): add local variables to protect objects from GC. [ruby-dev:44253] [Bug #5104] * test/rinda/test_rinda.rb: decrease the code that depends on timing. [Bug #372] [Bug #4160] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34602 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-14merge revision(s) 32640: [Backport #6017]naruse
* test/win32ole/test_err_in_callback.rb (test_err_in_callback): skip test if ADODB.connection is not available. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34601 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-14merge revision(s) 34415:naruse
* parse.y (debug_lines, coverage): set file path encoding for coverage result. [ruby-dev:44950] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34600 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-14merge revision(s) 33254:usa
* lib/rake/file_list.rb (Rake::FileList#egrep): there is no need to open files in binary mode. see more details in https://github.com/jimweirich/rake/issues/74 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34596 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-14merge revision(s) 33902:usa
* lib/rdoc/encoding.rb (RDoc::Encoding.read_file): fixup newline chars on Windows. see https://github.com/rdoc/rdoc/issues/87 * test/rdoc/test_rdoc_markup_pre_process.rb (TestRDocMarkupPreProcess#test_include_file, TestRDocMarkupPreProcess#test_include_file_encoding_incompatible): follow above change. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-14merge revision(s) 33232:usa
* test/rubygems/test_gem_commands_help_command.rb: Add one `require` because if run test-all with test/unit parallel running, sometimes this test fails by some constants not found. The error reason is some worker doesn't require the file needed by this test. This issue is related to [ruby-core:36168]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34594 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-14merge revision(s) 33500,33501:usa
* gc.c (rb_gc_set_params): set parameters always. [ruby-dev:44648] [Bug #5467] * gc.c (initial_params): pack in a struct. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34593 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-14merge revision(s) 34395:usa
* test/irb/test_completion.rb: skip if cannot load irb/completion (maybe readline does not exist). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34591 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-14merge revision(s) 34589:nobu
* lib/test/unit/assertions.rb (build_message): skip escaped question marks. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34590 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-13merge revision(s) 33935,33936,33987: [Backport #5702]naruse
* variable.c (set_const_visibility): Module#private_constant has changed the visibility of only the first argument. Now it changes all of them. [ruby-list:48558] * test/ruby/test_module.rb: add a test for above. * variable.c (set_const_visibility): print a warning when no argument is passwd to Module#private_constant. [ruby-list:48558] * vm_method.c (set_method_visibility): ditto for Module#private_class_method. * variable.c (set_const_visibility): clear inine-cache when constant's visibility is modified. [ruby-dev:44929] * test/ruby/test_module.rb (test_private_constants_clear_inlinecache): add test for it. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34579 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-13merge revision(s) 34576:nobu
* io.c (Init_IO): use directive hack to make ARGF documentable in other tools. [ruby-core:42515][Bug #6007] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34578 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-12merge revision(s) 34355:knu
* misc/rdoc-mode.el (rdoc-imenu-create-index): Add imenu support to rdoc-mode. * misc/rdoc-mode.el (rdoc-mode): Fix regexp patterns containing "\s " where CR/LF is not supposed to match. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34574 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-12merge revision(s) 34333:knu
* misc/rdoc-mode.el (rdoc-mode): Add provide so that requiring this library succeeds. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-12merge revision(s) 34413:knu
* lib/tempfile.rb (Tempfile#unlink, Tempfile::Remover#call): Just call File.unlink and ignore ENOENT because existence check before unlinking does not help in terms of race condition. * lib/tempfile.rb (Tempfile#unlink, Tempfile::Remover#call): My comment about thread safeness is obsolete. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34572 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-12merge revision(s) 34284:34286:knu
* lib/shellwords.rb: Fix rdoc markups. * lib/shellwords.rb (Shellwords#shellsplit): Fix a bug where consecutive backslashes in double quotes are all removed except the one at the tail. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34571 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-12merge revision(s) 34166:knu
* lib/shellwords.rb (Shellwords#shellescape): Drop the //n flag that only causes warnings with no real effect. [Bug #5637] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34570 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-12merge revision(s) 34568:knu
* tool/merger.rb (#default_merge_branch): Add support for Subversion 1.7 which adopted a whole new working directory structure. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34569 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-12merge revision(s) 32527,32567: [Backport #6004]naruse
* vm_method.c (rb_add_method): should not call method_added hook for undef operation. [Bug #5015] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34566 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-12merge revision(s) 32544: [Backport #6005]naruse
* regint.h (PLATFORM_UNALIGNED_WORD_ACCESS): Power PC does not allow unaligned word access. * st.c (UNALIGNED_WORD_ACCESS): x86_64 allows unaligned word access as well as i386. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-11revert r34558. I have accidentally backport r32550. I'm sorry.nagachika
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34559 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-11merge revision(s) 32550:nagachika
* win32/win32.c, include/ruby/win32.h (rb_w32_io_cancelable_p): renamed from rb_w32_has_cancel_io(). now it takes a parameter as fd to check the fd is console or not, because we cannot cancel console input even if we have cancel_io function. * io.c (WAIT_FD_IN_WIN32): call above function instead of the old one, so now we can kill the thread which calls STDIN.gets. the problem was reported by ko1 via IRC. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34558 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-11merge revision 32543:nagachika
* ChangeLog: fix a typo git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34557 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-11merge revisions 32532,32534:nagachika
* ChangeLog: fix typos. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34556 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-10merge revision(s) 33508:naruse
* test/openssl/test_ssl.rb (test_multibyte_read_write): start server for each length to avoid race condition. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34550 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-10Revert r34538.naruse
* backport 33935,33936,33987 (fix private constant) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34549 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-10merge revision(s) 34547:naruse
* dir.c (fnmatch): The * needs to be escaped to avoid formatting in fnmatch comment. patched by @dalton. https://github.com/ruby/ruby/pull/91 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34548 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-10merge revision(s) 34043,34045,34132: [Backport #5791]naruse
* win32/win32.c, include/ruby/win32.h (rb_w32_fd_is_text): new function. * win32/win32.c (init_stdhandle): set default mode of stdin as binmode. * io.c (set_binary_mode_with_seek_cur): new function to replace SET_BINARY_MODE_WITH_SEEK_CUR macro. now returns previous mode of the fd and take care of LF in rbuf. * io.c (do_writeconv): set text mode when needed. * io.c (io_read): need to change the mode of the IO to binmode temporally when the length for IO#read, because IO#read with length must behave so. * test/ruby/test_io_m17n.rb (TestIO_M17N#est_{read_with_length, read_with_length_binmode,get[cs]_and_read_with_binmode, read_with_binmode_and_get[cs],read_write_with_binmode}): tests for above changes. all patches are written by Hiroshi Shirosaki. [ruby-core:41496] [Feature #5714] * test/ruby/test_io_m17n.rb (TestIO_M17N#test_{read_with_binmode_and_get[cs]}): only for Windows. * test/ruby/test_io_m17n.rb (TestIO_M17N#test_{read_with_length, * io.c (rb_sys_fail_path): move the definition. Move above for using it in set_binary_mode_with_seek_cur(). * io.c (set_binary_mode_with_seek_cur): fix improper seek cursor. Seeking file cursor with setting binary mode has possibility to cause infinite loop. Fixed the bug and refined error handling. Introduced at r34043. And cleanups as below. Remove unnecessary parentheses of `fptr`. Use return value of setmode(). * test/ruby/test_io_m17n.rb (TestIO_M17N#test_seek_with_setting_binmode): add a test for abobe. [ruby-core:41671] [Bug #5714] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34546 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-10merge revision(s) 33981: [Backport #5792]naruse
* test/rexml/test_order.rb (OrderTester#test_more_ordering): use GZip::GzReader.open instead of GZip::GzReader.new with File.new. fixed a test error on Windows introduced at r33946. fixed test errors on Windows introduced at r33953. fixed test errors on Windows introduced at r33947. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34545 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-10merge revision(s) 33946:naruse
* ext/zlib/zlib.c (rb_gzreader_initialize): revert a part of r33937. 1st, to change the mode of an IO is very sensitive problem, so the maintainer of this library should judge it. 2nd, usually Zlib::GzReader.new is not called directly. #initialize is called via .open, and in the method the I/O is opened in binary mode, so there is no problem without changing the mode in #initialize. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34544 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-10merge revision(s) 33937: [Backport #5704]naruse
* ext/zlib/zlib.c (rb_gzreader_initialize): use binary mode by default under Windows. Patch by Hiroshi Shirosaki. [ruby-core:40706] [Feature #5562] * include/ruby/encoding.h (void rb_econv_binmode): define NEWLINE decorator. * io.c (rb_cloexec_fcntl_dupfd): Introduce NEED_READCONV and NEED_WRITECONV to replace universal newline decorator by CRLF only when required to improve file reading and writing under Windows. Patch by Hiroshi Shirosaki. [ruby-core:40706] [Feature #5562] * io.c (do_writeconv): adjust binary mode if required. * io.c (read_all, appendline, swallow, rb_io_getline_1): ditto. * io.c (io_getc, rb_io_each_codepoint, rb_io_ungetc): ditto. * io.c (rb_io_binmode, rb_io_ascii8bit_binmode): ditto. * io.c (rb_io_extract_modeenc, rb_sysopen): ditto. * io.c (pipe_open, prep_stdio, io_encoding_set): ditto. * io.c (rb_io_s_pipe, copy_stream_body): ditto. * test/ruby/test_io_m17n.rb (EOT): add test for pipe and stdin in binary mode. * win32/win32.c (init_stdhandle): remove O_BINARY from stdhandle initialization. * win32/win32.c (rb_w32_write): use FTEXT mode accordingly. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34543 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-10merge revision(s) 33662,33666,33770: [Backport #5793]naruse
------------------------------------------------------------------------ r33662 | usa | 2011-11-08 02:48:11 +0900 (Tue, 08 Nov 2011) | 18 lines * include/ruby/encoding.h (ECONV_NEWLINE_DECORATOR_READ_MASK, ECONV_NEWLINE_DECORATOR_WRITE_MASK): new macro. * io.c (rb_io_extract_modeenc, pipe_open, prep_stdio, argf_next_argv): set TEXTMODE_NEWLINE_DECORATOR_ON_WRITE for textmode on creating IO if the flag is available. * io.c (make_writeconv): drop decorators for reading. * io.c (make_readconv): drop decorators for writing. * io.c (do_writeconv): existing writeconv is not the condition to raise ArgumentError. should check textmode or not. * test/ruby/test_io_m17n.rb (TestIO_M17N#test_{cr,lf,crlf}_decorator_on_stdout): test above changes. ------------------------------------------------------------------------ * include/ruby/encoding.h (ECONV_NEWLINE_DECORATOR_READ_MASK, ECONV_NEWLINE_DECORATOR_WRITE_MASK): new macro. * io.c (rb_io_extract_modeenc, pipe_open, prep_stdio, argf_next_argv): set TEXTMODE_NEWLINE_DECORATOR_ON_WRITE for textmode on creating IO if the flag is available. * io.c (make_writeconv): drop decorators for reading. * io.c (make_readconv): drop decorators for writing. * io.c (do_writeconv): existing writeconv is not the condition to raise ArgumentError. should check textmode or not. * test/ruby/test_io_m17n.rb (TestIO_M17N#test_{cr,lf,crlf}_decorator_on_stdout): test above changes. * io.c (argf_next_argv): wrong timing of setting ecflags. fixed the failure of TestArgf#test_textmode introduced at r33662. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34542 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-10merge revision(s) 33152,33649:naruse
* test/ruby/test_io_m17n.rb (TestIO_M17N#test_{default_mode_on_dosish, default_mode_on_unix,text_mode,binary_mode}): sorry for wrong test committed in r33144. I'd misunderstood the spec of ruby's universal newline. * test/ruby/test_io_m17n.rb (TestIO_M17N#test_default_stdout_stderr_mode): new test for r33627-33629. see [backport #5565] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34541 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-10merge revision(s) 33144:naruse
* test/ruby/test_io_m17n.rb (TestIO_M17N#test_{default_mode_on_dosish, default_mode_on_unix,text_mode,binary_mode}): tests for [Bug #5164]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34540 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-10merge revision(s) 33200: [Backport #5794]naruse
* transcode.c: enabled econv newline option. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e