]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorAnatol Belski <ab@php.net>
Mon, 27 Nov 2017 20:18:54 +0000 (21:18 +0100)
committerAnatol Belski <ab@php.net>
Mon, 27 Nov 2017 20:18:54 +0000 (21:18 +0100)
* PHP-7.1:
  Fix allocation
  Fix memory leak

1  2 
ext/standard/basic_functions.c

Simple merge