summaryrefslogtreecommitdiff
path: root/ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2015-04-05 17:37:44 -0700
committerStanislav Malyshev <stas@php.net>2015-04-05 17:37:44 -0700
commit8976e8d9f05dbfae389934598e4ed473a48a9458 (patch)
tree747c687ca93ea94a9eaa6af5ad20897686693a3f /ext/intl/breakiterator/rulebasedbreakiterator_methods.cpp
parentf1aa1dcb545c1a11b23f189dddb829ea459ac3b4 (diff)
parentc167029eb6d22563ddc2a4b32588e25d8ad74ac4 (diff)
downloadphp-git-8976e8d9f05dbfae389934598e4ed473a48a9458.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: 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