]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 150e380 0445abd)
Merge branch 'PHP-5.6' into PHP-7.0
authorAnatol Belski <ab@php.net>
Thu, 18 Feb 2016 18:33:27 +0000 (19:33 +0100)
committerAnatol Belski <ab@php.net>
Thu, 18 Feb 2016 18:33:27 +0000 (19:33 +0100)
* PHP-5.6:
  Fixed bug #71625 Crash in php7.dll with bad phar filename

1  2 
ext/phar/phar.c patch | diff1 | diff2 | blob | history

diff --cc ext/phar/phar.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.