]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorAnatol Belski <ab@php.net>
Fri, 2 Sep 2016 22:05:02 +0000 (00:05 +0200)
committerAnatol Belski <ab@php.net>
Fri, 2 Sep 2016 22:05:02 +0000 (00:05 +0200)
commit7483acf511a1932adec1fd29bebee5056283311c
tree513db1546593a3261eb35377aed7e92b97045050
parente14b14d026fd588117d8c976cb2dfdeafb45c8dd
parent5efd2a33df62d2bcaeeb6c8ff6ef20478f3a5417
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix double free
ext/phar/zip.c