]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 829ea23 bd31cb7)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 6 Apr 2015 00:36:52 +0000 (17:36 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 6 Apr 2015 00:36:52 +0000 (17:36 -0700)
commit96f5be53f67cfb2caa156f363b6b3245a1ed4568
tree0e7a6079c67718f6a787b526a6a1caea7d8843dctree | snapshot
parent829ea23d3431164ff3d2061ba2bfd9e387d6dd7acommit | diff
parentbd31cb756399101234258c5491443531099957c3commit | diff
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467
  Fix bug #68601 buffer read overflow in gd_gif_in.c
  Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
  Fixed bug #69293
  Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.
Unnamed repository; edit this file 'description' to name the repository.