diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-07-07 15:05:35 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-07-07 15:05:35 -0700 |
| commit | e4fc1d5d1db500c67ba6ce2e0916baeec1f1859e (patch) | |
| tree | bbb00aab381acb499aef15effc844815e689d105 /configure.in | |
| parent | a46bae2df257ec9bbc601204c73a8f7b103edee1 (diff) | |
| parent | 885edfef0a0eb1016a906d197399f92375a795e4 (diff) | |
| download | php-git-e4fc1d5d1db500c67ba6ce2e0916baeec1f1859e.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.4.43
* PHP-5.4:
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
add missing second argument for ucfirst to the proto
Conflicts:
ext/mysqlnd/mysqlnd.c
ext/phar/phar_object.c
ext/phar/tests/bug69958.phpt
Diffstat (limited to 'configure.in')
0 files changed, 0 insertions, 0 deletions