diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-07-07 10:12:51 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-07-07 10:12:51 -0700 |
| commit | 6c884e8e84615488e51f1837656a5a5d0bc2449e (patch) | |
| tree | 8792716795ddea24ed0ad945b423e012410cfa8d /sapi/phpdbg/phpdbg_cmd.c | |
| parent | c0142de470b5f57975054a51833273b01f569333 (diff) | |
| parent | b4b082e63ecab2a81e565fb07aafaaaf67b77f66 (diff) | |
| download | php-git-6c884e8e84615488e51f1837656a5a5d0bc2449e.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Better fix for bug #69958
update news
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
Fix bug #69958 - Segfault in Phar::convertToData on invalid file
Better fix for bug #69958
Better fix for bug #69958
update news
Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
Fix bug #69958 - Segfault in Phar::convertToData on invalid file
Conflicts:
ext/phar/phar_object.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_cmd.c')
0 files changed, 0 insertions, 0 deletions