Commit graph

24190 commits

Author SHA1 Message Date
naruse
c1303fbe8a merge revision(s) 34255: [Backport #6035]
* test/readline/test_readline.rb (test_completion_proc_empty_result): rescue NoMemoryError.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34657 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-17 03:25:38 +00:00
naruse
54209dd172 merge revision(s) 34115:
* test/readline/test_readline.rb (test_line_buffer__point): use
	  lambda not to exit entire method by "return".  or "next" for
	  proc.  [ruby-dev:45042] [Bug #5802]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34655 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-17 02:47:10 +00:00
naruse
c32308780c merge revision(s) 34644:
* ext/dbm/extconf.rb: check _DB_H_ macro unavailable except
	  Berkeley DB library.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34654 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-17 01:16:19 +00:00
naruse
3558675488 merge revision(s) 34646:
* test/dbm/test_dbm.rb: fix skip condition for libgdbm 1.8.0 or prior.
	  reported by Bohuslav Kabrda.
	  [ruby-core:42685] [ruby-trunk - Bug #6036]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34653 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-17 01:14:57 +00:00
naruse
bae9e4a0bc merge revision(s) 34650:
* tool/transcode-tblgen.rb (import_ucm): don't use \h because the
	  script should work with ruby 1.8.

	* tool/enc-unicode.rb: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-17 00:54:14 +00:00
naruse
a81c766340 Fix debug line of ext/dbm/extconf.rb in r34641. [Backport #6021]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34649 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-17 00:38:04 +00:00
naruse
de889a30d2 * ext/dbm/extconf.rb: merge trunk's ext/dbm/extconf.rb and
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-16 08:56:21 +00:00
naruse
4ec9395ba2 merge revision(s) 32730:
* 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-16 00:26:09 +00:00
naruse
4f05bf852b merge revision(s) 32731,32734,32738:
------------------------------------------------------------------------
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-16 00:25:11 +00:00
nagachika
d23a588b22 merge revision(s) r32583:
* 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-15 22:50:46 +00:00
naruse
8cdf5c4179 merge revision(s) 34629,34630:
* 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-15 22:34:48 +00:00
naruse
a4debd6ae2 merge revision(s) 34626,34627:
* 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 21:31:16 +00:00
svn
4dc3d30ab5 * 2012-02-16
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34635 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-15 21:05:05 +00:00
marcandre
95dd735aec merge revision(s) 34619:
* 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-15 21:05:01 +00:00
nobu
7b7aa9f573 merge revision(s) 34261,34351:
------------------------------------------------------------------------
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-15 01:36:49 +00:00
nobu
e56eea5e37 merge revision(s) r34564:
* 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-15 01:33:56 +00:00
nobu
afcd5562ae merge revision(s) r32855,r32857,r33493,r34554:
* 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-15 01:29:34 +00:00
nobu
50a470b853 merge revision(s) 33866,33867:
------------------------------------------------------------------------
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-15 01:10:29 +00:00
naruse
00af7b8f9a merge revision(s) 34555: [Backport #5786]
* 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-14 22:16:06 +00:00
naruse
35c546104b merge revision(s) 32712,32718,32719: [Backport #6014]
* 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-14 20:09:27 +00:00
naruse
0c8cfb4eab merge revision(s) 32720: [Backport #6015]
* 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-14 20:05:04 +00:00
naruse
44d3cf03fd merge revision(s) 32705,32717: [Backport #6016]
* 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-14 20:04:06 +00:00
naruse
dbda1e9ea7 merge revision(s) 32640: [Backport #6017]
* 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-14 20:03:06 +00:00
naruse
5f06da63d6 merge revision(s) 34415:
* 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-14 20:01:09 +00:00
usa
2349592a51 merge revision(s) 33254:
* 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-14 07:58:23 +00:00
usa
39432526b6 merge revision(s) 33902:
* 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-14 07:55:37 +00:00
usa
ac81a6e38d merge revision(s) 33232:
* 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-14 07:36:03 +00:00
usa
aa815c5824 merge revision(s) 33500,33501:
* 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-14 07:09:32 +00:00
usa
1bf61d770a merge revision(s) 34395:
* 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-14 06:45:33 +00:00
nobu
83f1aca178 merge revision(s) 34589:
* 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-14 06:07:39 +00:00
naruse
e782ca865b merge revision(s) 33935,33936,33987: [Backport #5702]
* 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-13 04:51:21 +00:00
nobu
8f8764fd31 merge revision(s) 34576:
* 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-13 03:06:52 +00:00
knu
d296c3d27a merge revision(s) 34355:
* 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-12 07:58:16 +00:00
knu
9719bfd77a merge revision(s) 34333:
* 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-12 07:56:44 +00:00
knu
66f39c771a merge revision(s) 34413:
* 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-12 07:54:28 +00:00
knu
c9fac6977b merge revision(s) 34284:34286:
* 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-12 07:51:05 +00:00
knu
b760f18a9f merge revision(s) 34166:
* 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-12 07:38:38 +00:00
knu
f4df871a4f merge revision(s) 34568:
* 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-12 07:35:32 +00:00
naruse
7d86051f25 merge revision(s) 32527,32567: [Backport #6004]
* 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-12 00:42:37 +00:00
naruse
16c364121b merge revision(s) 32544: [Backport #6005]
* 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-12 00:30:50 +00:00
nagachika
f3ee8b01c9 revert r34558. I have accidentally backport r32550. I'm sorry.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34559 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-11 07:06:25 +00:00
nagachika
31dd3b3281 merge revision(s) 32550:
* 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-11 06:55:45 +00:00
nagachika
6396bcb8e3 merge revision 32543:
* 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-11 06:42:53 +00:00
nagachika
c2ae84bc4a merge revisions 32532,32534:
* 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-11 06:39:40 +00:00
naruse
83af59b8d6 merge revision(s) 33508:
* 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-10 23:06:56 +00:00
naruse
c0cdff2c0f Revert r34538.
* 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-10 21:32:02 +00:00
naruse
d14b60fff0 merge revision(s) 34547:
* 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-10 21:14:03 +00:00
naruse
a208a75072 merge revision(s) 34043,34045,34132: [Backport #5791]
* 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-10 18:39:05 +00:00
naruse
8774691972 merge revision(s) 33981: [Backport #5792]
* 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-10 18:38:08 +00:00
naruse
6d0f11de6a merge revision(s) 33946:
* 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-10 18:37:45 +00:00