]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorStanislav Malyshev <stas@php.net>
Mon, 16 Jan 2017 01:32:37 +0000 (17:32 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 16 Jan 2017 01:32:37 +0000 (17:32 -0800)
* PHP-7.0:
  Update more functions with path check

1  2 
ext/exif/exif.c
ext/zip/php_zip.c

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