summaryrefslogtreecommitdiff
path: root/ext/mbstring/php_mbregex.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2014-05-11 18:55:02 -0700
committerStanislav Malyshev <stas@php.net>2014-05-11 18:56:32 -0700
commitf2fdeba19d37080ddc27198a0879bb0254684c5b (patch)
tree349e3a622724d594aab12effb4a0376ff026c6b9 /ext/mbstring/php_mbregex.c
parent9d8a00337dc92273e1006cfc72e21dcc4217fa9b (diff)
parentaf5cc61cf374f3700872c989cfdf8e197248c57c (diff)
downloadphp-git-f2fdeba19d37080ddc27198a0879bb0254684c5b.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Fix bug #67248 (imageaffinematrixget missing check of parameters) Fix bug #67247 spl_fixedarray_resize integer overflow fix news add tests stuff to README Updated NEWS Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) Linux apparently does not like memcpy in overlapping regions...
Diffstat (limited to 'ext/mbstring/php_mbregex.c')
0 files changed, 0 insertions, 0 deletions