]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorAnatol Belski <ab@php.net>
Thu, 30 Aug 2018 17:34:01 +0000 (19:34 +0200)
committerAnatol Belski <ab@php.net>
Thu, 30 Aug 2018 17:34:01 +0000 (19:34 +0200)
* PHP-7.1:
  Fix stack underflow in phar

1  2 
ext/phar/phar.c

diff --cc ext/phar/phar.c
Simple merge