diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-04-05 17:36:52 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-04-05 17:36:52 -0700 |
| commit | 96f5be53f67cfb2caa156f363b6b3245a1ed4568 (patch) | |
| tree | 0e7a6079c67718f6a787b526a6a1caea7d8843dc /ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp | |
| parent | 829ea23d3431164ff3d2061ba2bfd9e387d6dd7a (diff) | |
| parent | bd31cb756399101234258c5491443531099957c3 (diff) | |
| download | php-git-96f5be53f67cfb2caa156f363b6b3245a1ed4568.tar.gz | |
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.
Diffstat (limited to 'ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp')
0 files changed, 0 insertions, 0 deletions