diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-07-07 10:12:51 -0700 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2015-07-09 18:22:11 +0200 |
| commit | d1370e201609b0a9010a83bed9071c2a39741612 (patch) | |
| tree | a433bf87526c5758a7020728d85bf3805cf72db5 /ext/mysql/php_mysql.c | |
| parent | d4b97c6134af9312e8b49f4258780adb329f7ca4 (diff) | |
| download | php-git-d1370e201609b0a9010a83bed9071c2a39741612.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 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions