merge revision(s) 42060: [Backport #9915]

	* ext/pathname/pathname.c (path_inspect): use PRIsVALUE to preserve
	  the result encoding.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47929 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 47683: [Backport #10281]

	array.c: GC guard

	* array.c (rb_ary_splice): prevent replacing array from GC.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47930 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 47641,47642,47644: [Backport #10262]

	* win32/win32.c (VCSUP): nothing to do if this worktree is not under
	  any VCS (it means that the worktree may be from the release package).

	* win32/Makefile.sub (VCSUP): nothing to do if this worktree is not
	  under any VCS (it means that the worktree may be from the release
	  package).


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47931 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 47820: [Backport #10330]

	* error.c: update exception tree. [DOC]
	  reported by @hemge via twitter.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47932 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 47819: [Backport #9914]

	* configure.in: Fix typo. [Bug #9914]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47933 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 47850: [Backport #10294]

	* dir.c (dir_s_aref): fix rdoc.  `Dir.glob` allows an array but
	  `Dir[]` not.  the former accepts an optional parameter `flags`,
	  while the latter accepts arbitrary number of arguments but no
	  `flags`.  [ruby-core:65265] [Bug #10294]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47934 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 47891: [Backport #10373]

	proc.c: method body GC guard

	* proc.c (rb_mod_define_method): guard method body to prevent its
  method entry from GC.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47935 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 47896: [Backport #10369]

	* array.c (ary_recycle_hash): add RB_GC_GUARD
	  (rb_ary_diff): remove volatile
	  [Bug #10369]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 47111,47212,47451,47452,47680: [Backport #10245]

	* test/minitest/test_minitest_unit.rb: removed obsoleted condition
	  for Ruby 1.8.

	* test/ruby/test_time_tz.rb: ditto.

	* test/ruby/test_time_tz.rb: Fix test error with tzdata-2014g.
	  [ruby-core:65058] [Bug #10245] Reported by Vit Ondruch.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47937 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 46783: [Backport #6716]

	* lib/fileutils.rb: handle ENOENT error with symlink targeted to
	  non-exists file. [ruby-dev:45933] [Bug #6716]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47974 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* regcomp.c, regexec.c: Optimization should be disabled not only for
  /(?<=x).*/ but also for /(?!x).*/.
  (merge r47598 partially. [Bug #9728])


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47976 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 47645: [Backport #10263]

	* vm_eval.c (eval_string_with_cref): fix super from eval with
	  scope.  set klass in the current control frame to the class of
	  the receiver in the context to be evaluated, this class/module
	  must match the actual receiver to call super.
	  [ruby-core:65122] [Bug #10263]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47987 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 47716: [Backport #10285]

	* ext/stringio/stringio.c (strio_write): ASCII-8BIT StringIO
	  should be writable any encoding strings, without conversion.
	  [ruby-core:65240] [Bug #10285]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47988 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 47973: [Backport #10392]

	* parse.y (parser_here_document): do not append already appended
	  and disposed code fragment.  [ruby-dev:48647] [Bug #10392]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47989 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 48000: [Backport #10368]

	* vm_core.h, vm.c, proc.c: fix GC mark miss on bindings.
	  [ruby-dev:48616] [Bug #10368]

	* test/ruby/test_eval.rb: add a test code.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@48048 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 45274,45278,45280,48097: [Backport #9424]

	* lib/openssl/ssl.rb: Explicitly whitelist the default
	  SSL/TLS ciphers. Forbid SSLv2 and SSLv3, disable
	  compression by default.
	  Reported by Jeff Hodges.
	  [ruby-core:59829] [Bug #9424]

	* test/openssl/test_ssl.rb: Reuse TLS default options from
	  OpenSSL::SSL::SSLContext::DEFAULT_PARAMS.

	* ext/openssl/lib/openssl/ssl.rb (DEFAULT_PARAMS): override
	  options even if OpenSSL::SSL::OP_NO_SSLv3 is not defined.
	  this is pointed out by Stephen Touset. [ruby-core:65711] [Bug #9424]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@48110 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 48111,48118,48120: [Backport #10421]

	* vm_method.c (rb_method_entry_make): warn redefinition only for
	  already defined methods, but not for undefined methods.
	  [ruby-dev:48691] [Bug #10421]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@48149 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 48161:

	* lib/rexml/entity.rb: keep the entity size within the limitation.
	  reported by Willis Vandevanter <will@silentrobots.com> and
	  patched by nahi.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@48162 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* test/rexml/test_document.rb: fix typo (patch mistake).
  reported and patched by Jeremy Evans at [Bug #10439]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@48171 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* 2014-10-28

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@48172 b2dd03c8-39d4-4d8f-98ff-823fe69b080e