diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-10-14 10:53:05 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-10-14 10:53:05 -0700 |
| commit | abe907b34351e7e08c6d512ec437dee8805bb2f7 (patch) | |
| tree | 0534830e500222643d6bd7ad61d4c8001955bc5d /sapi/cli/php_cli.c | |
| parent | 4a38cc0a3c4db2ac42a5063df0f6ee1ec70b30ff (diff) | |
| parent | 3e4cef131e503072d6dbb8b406db01fe5e00aefd (diff) | |
| download | php-git-abe907b34351e7e08c6d512ec437dee8805bb2f7.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix bug #68113 (Heap corruption in exif_thumbnail())
Fix bug #68089 - do not accept options with embedded \0
Fixed bug #68044: Integer overflow in unserialize() (32-bits only)
Fix bug #68027 - fix date parsing in XMLRPC lib
Fix bug #68113 (Heap corruption in exif_thumbnail())
Fix bug #68089 - do not accept options with embedded \0
Fixed bug #68044: Integer overflow in unserialize() (32-bits only)
Fix bug #68027 - fix date parsing in XMLRPC lib
Conflicts:
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
Diffstat (limited to 'sapi/cli/php_cli.c')
0 files changed, 0 insertions, 0 deletions