]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Mon, 16 Jan 2017 01:32:26 +0000 (17:32 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 16 Jan 2017 01:32:26 +0000 (17:32 -0800)
commit43d0f2abc552781847a23fe9b2d89925c6201078
treeba0e2de3207adcda7a45b2ccd6c282f7a72935f2
parent4f19bb7af61fb05f369b0bc48a962eae5ab23320
parent0ab1af7d3eff815e1809fe044e54283b5a1b8e27
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Update more functions with path check
ext/curl/curl_file.c
ext/exif/exif.c
ext/zip/php_zip.c