]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorThomas Punt <tpunt@php.net>
Mon, 29 Jan 2018 11:13:22 +0000 (11:13 +0000)
committerThomas Punt <tpunt@php.net>
Mon, 29 Jan 2018 11:13:22 +0000 (11:13 +0000)
* PHP-7.1:
  Use the correct freeing function

1  2 
ext/sockets/sockets.c

Simple merge