diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-05-12 14:31:52 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-05-12 15:00:24 -0700 |
| commit | 5a1bef8eef07881f8620c4521fcd108e75e4728d (patch) | |
| tree | a2f10bec8431692e286bb21c8a0bdee6ba730ece /ext/mcrypt/php_mcrypt.h | |
| parent | 468e37fe027259fd0a61ac3a84cac1336f768005 (diff) | |
| parent | 587ddf6ddccd707d67d48dccd4f4ca0a90224ac9 (diff) | |
| download | php-git-5a1bef8eef07881f8620c4521fcd108e75e4728d.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fix format
update NEWS
Add test for bug #69522
Update tests
Fix bug #69522 - do not allow int overflow
Forgot test file
Fix bug #69403 and other int overflows
Fixed bug #69418 - more s->p fixes for filenames
Fixed bug #69364 - use smart_str to assemble strings
Fix bug #69453 - don't try to cut empty string
Fix bug #69545 - avoid overflow when reading list
Conflicts:
Zend/zend_alloc.c
Zend/zend_operators.c
ext/ftp/ftp.c
ext/pcntl/pcntl.c
ext/standard/basic_functions.c
ext/standard/dir.c
ext/standard/file.c
ext/standard/pack.c
ext/standard/string.c
main/rfc1867.c
Diffstat (limited to 'ext/mcrypt/php_mcrypt.h')
0 files changed, 0 insertions, 0 deletions