Merge branch 'PHP-5.6' into PHP-7.0

author Christoph M. Becker <cmb@php.net>

Thu, 28 Jul 2016 15:30:29 +0000 (17:30 +0200)

committer Christoph M. Becker <cmb@php.net>

Thu, 28 Jul 2016 15:30:29 +0000 (17:30 +0200)
author Christoph M. Becker <cmb@php.net>
Thu, 28 Jul 2016 15:30:29 +0000 (17:30 +0200)
committer Christoph M. Becker <cmb@php.net>
Thu, 28 Jul 2016 15:30:29 +0000 (17:30 +0200)
diff --cc ext/sockets/tests/socket_cmsg_rights.phpt
Simple merge
author	Christoph M. Becker <cmb@php.net>
	Thu, 28 Jul 2016 15:30:29 +0000 (17:30 +0200)
committer	Christoph M. Becker <cmb@php.net>
	Thu, 28 Jul 2016 15:30:29 +0000 (17:30 +0200)