merge revision(s) r40833:

	Default script encoding is now UTF-8

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

	* test/ruby/envutil.rb (assert_separately): require envutil in the
	  child process too.


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

	envutil.rb: encoding

	* test/ruby/envutil.rb (Test::Unit::Assertions#assert_separately):
  specify the encoding of source.

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

	fix warning: shadowing outer local variable - path

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45048 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) r43148,r43149,r43152: [Backport #8433]

	* thread.c (terminate_atfork_i): fix locking mutexes not unlocked in
	  forks when not tracked in thread.  [ruby-core:55102] [Bug #8433]


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

	* lib/optparse.rb:  The Integer acceptable now allows binary and
	  hexadecimal numbers per the documentation.  [ruby-trunk - Bug #8865]
	  DecimalInteger, OctalInteger, DecimalNumeric now validate their input
	  before converting to a number.  [ruby-trunk - Bug #8865]

	* test/optparse/test_acceptable.rb:  Tests for the above, tests for all
	  numeric acceptables for existing behavior.


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

	* vm_insnhelper.c (vm_search_super_method): when super called in a
	  bound UnboundMethod generated from a module, no superclass is
	  found since the current defined class is the module, then call
	  method_missing in that case.  [ruby-core:59619] [Bug #9377]


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

	* ext/.document:  Add syslog/lib to documentable items. [Bug #9228]


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

	* ext/openssl/lib/openssl/buffering.rb: [DOC] Fix HEREDOC comment for
	  OpenSSL::Buffering which breaks overview because of RDoc bug

	* ext/openssl/lib/openssl/buffering.rb: Fix warning in copyright


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

	ext/psych/yaml: suppress warnings

	* ext/psych/yaml/emitter.c (WRITE_BREAK, PUT_BREAK): suppress
  unused-value warnings.

	* ext/psych/yaml/parser.c, ext/psych/yaml/scanner.c: suppress
  unused-but-set-variable warnings.

	* ext/psych/yaml/yaml_private.h (STACK_EMPTY): ditto.

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

	* class.c (rb_mod_init_copy): do nothing if copying self.
	  [ruby-dev:47989] [Bug #9535]

	* hash.c (rb_hash_initialize_copy): ditto.


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

	* ext/socket/ancdata.c (bsock_sendmsg_internal): only retry on error
	  (bsock_recvmsg_internal): ditto

	* test/socket/test_unix.rb: test above for infinite loop


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45098 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
(merged partially from r42927)

* lib/rubygems/core_ext/kernel_require.rb: Backport a fix for concurrent
  requires. [ruby-core:58918] [Backport #9224]
  see also https://github.com/rubygems/rubygems/pull/833


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45100 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
update patchlevel for the last commit.


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

	* ext/socket/init.c (wait_connectable): break if the socket is
	  writable to avoid infinite loops on FreeBSD and other platforms
	  which conforms to SUSv3.  This problem cannot be reproduced with
	  loopback interfaces, so it's hard to write test code.
	  rsock_connect() and wait_connectable() are overly complicated, so
	  they should be refactored, but I commit this fix as a workaround
	  for the release of Ruby 1.9.3 scheduled on Feb 24.
	  [ruby-core:60940] [Bug #9547]


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

	* compile.c (iseq_build_from_ary_body): Use :blockptr instead of :block
	  as hash key when loading serialized instruction sequences from arrays.
	  [Bug #9455] [ruby-core:60146]


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

	* iseq.c (iseq_load): keep type_map to get rid of memory leak.
	  based on a patch by Eric Wong at [ruby-core:59699].  [Bug #9399]


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

	* ext/io/console/console.c (console_dev): need read access for conout$
	  because some functions need it.  [Bug#9554]


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

	Fix a filename.


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