diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-07-07 10:19:20 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-07-07 10:19:20 -0700 |
| commit | a5e7075d79bbee954e909a7afd9eb27256e42af6 (patch) | |
| tree | 33a3d797c5f5d09288f401139cf1b7357f00fbce /sapi/phpdbg/phpdbg_cmd.c | |
| parent | 2d0771d66c98b82e3821b055824c46ba6130d98e (diff) | |
| parent | 6c884e8e84615488e51f1837656a5a5d0bc2449e (diff) | |
| download | php-git-a5e7075d79bbee954e909a7afd9eb27256e42af6.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
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/mysqlnd/mysqlnd.c
ext/phar/phar_object.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_cmd.c')
0 files changed, 0 insertions, 0 deletions