diff options
| author | Anatol Belski <ab@php.net> | 2014-05-14 08:21:12 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-05-14 08:21:12 +0200 |
| commit | 1ddecc9d12c506d69b7c2a4b7d25ec52d65add87 (patch) | |
| tree | d0c9268e9a53985f705611a153cae1d25b650463 /sapi/phpdbg/phpdbg_lexer.c | |
| parent | a582692720b0b8b857b755d507a982c130e3a425 (diff) | |
| parent | 5a169310f0d046f3acdf2872e58a7d01710beaa2 (diff) | |
| download | php-git-1ddecc9d12c506d69b7c2a4b7d25ec52d65add87.tar.gz | |
Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6: (32 commits)
5.4.30 next
enable email notifications
update NEWS
update NEWS
update NEWS
- Updated to version 2014.3 (2014c)
fix test - output can be chunked
fix test
Fixed test for commit 997be125eb0228c5b1b6dd278f617791e71192c6
Add bug fix to NEWS
Update UPGRADING according to bug fix
improve CURL tests to allow testing without separate server
Fixed bug #67199 mb_regex_encoding mishmash
fix bug #67253: timelib_meridian_with_check out-of-bounds read
Fix bug #67252: convert_uudecode out-of-bounds read
Fix bug #67251 - date_parse_from_format out-of-bounds read
Fix bug #67250 (iptcparse out-of-bounds read)
Fix bug #67248 (imageaffinematrixget missing check of parameters)
Fix bug #67247 spl_fixedarray_resize integer overflow
fix news
...
Conflicts:
ext/gd/gd.c
ext/standard/iptc.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_lexer.c')
0 files changed, 0 insertions, 0 deletions