merge revision(s) 33210,33212: [Backport #5278]

	* lib/rexml/parsers/baseparser.rb, test/rexml/test_comment.rb:
	  allow a single hyphen in comment. [Bug 5278]
	  Reported by Thomas Fritzsche. Thanks!!!
	  allow a single hyphen in comment. [Bug #5278] [ruby-core:39289]


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

	* ext/socket/basicsocket.c (bsock_getsockname): ignore truncated
	  part of socket address.
	  (bsock_getpeername): ditto.
	  (bsock_local_address): ditto.
	  (bsock_remote_address): ditto.

	* ext/socket/unixsocket.c (unix_path): ditto.
	  (unix_addr): ditto.
	  (unix_peeraddr): ditto.

	* ext/socket/init.c (cloexec_accept): ditto.


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