* ruby_atomic.h: fixed merge mistake of r44946.  reported by ngoto at
  [ruby-dev:47980] [Backport #9530]


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

	Set encoding as ASCII-8BIT. [Bug #6027]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@45040 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 45076: [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_1_9_3@45091 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 45084: [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_1_9_3@45092 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 45066: [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_1_9_3@45093 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* test/socket/test_unix.rb: 1.9.3 doesn't have IO::EAGAINWaitReadable.
  use IO::WaitReadable instead.  this fixes the test failure introduced
  at r45093.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@45095 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 45130: [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_1_9_3@45131 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 44585: [Backport #9268]

	* lib/net/smtp.rb: [DOC] Remove dead link to RAA by Giorgos Tsiftsis
	  Fixes the following bugs: [Bug #9152] [Bug #9268] [Bug #9394]

	* lib/open-uri.rb: ditto


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@45154 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 44584,44587,44945: [Backport #9243]

	* ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Szﾃｼcs [Bug #9243]

	* ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Sz?cs [Bug #9243]

	* ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Szuecs [Bug #9243]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@45157 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 44878,44879: [Backport #9483]

	* ext/ripper/lib/ripper/lexer.rb: [DOC] use lower case version of core
	  classes when referring to return value, since we aren't directly
	  talking about the class. Patch by Jonathan Jackson [Bug #9483]

	* lib/open-uri.rb: [DOC] use lower case version of core classes, same
	  as commit r44878, based on patch by Jonathan Jackson [Bug #9483]


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