]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Wed, 26 Aug 2020 10:12:23 +0000 (12:12 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Wed, 26 Aug 2020 10:12:23 +0000 (12:12 +0200)
commiteb17f996fbef9ee1ef6ccc633d2870ac967f3308
tree58a050240bb8846b62ebbff70dd95232d40704b6
parent083f5f2005e189076817368586abf49995d6ed06
parent0487bcfac763453b3a386fe808d3ad58683936c9
Merge branch 'PHP-7.4'

* PHP-7.4:
  Avoid socket path clash in test
ext/sockets/tests/socket_cmsg_credentials.phpt
ext/sockets/tests/socket_cmsg_rights.phpt