]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorkrakjoe <krakjoe@php.net>
Wed, 22 Nov 2017 04:49:43 +0000 (04:49 +0000)
committerkrakjoe <krakjoe@php.net>
Wed, 22 Nov 2017 04:49:43 +0000 (04:49 +0000)
* PHP-7.1:
  Check for binary_location allocation failure

1  2 
main/main.c

diff --cc main/main.c
Simple merge