diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-06-24 10:25:09 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-06-24 10:25:09 -0700 |
| commit | e2ed4874b54b7d3673d68a6790a91bb85e3eb2e6 (patch) | |
| tree | ea1c2e976a2183d47eabfe5145259e8dba75da87 /sapi/phpdbg/phpdbg_help.c | |
| parent | 7ffcb48184a454fbe491e650fd177e07d713b2d6 (diff) | |
| parent | 3488cf6fd8a6510bf523a877eb63e86d39c7f9bd (diff) | |
| download | php-git-e2ed4874b54b7d3673d68a6790a91bb85e3eb2e6.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
5.4.30
Better fix for bug #67072 with more BC provisions
Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
update CVE
Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
Fix bug #67349: Locale::parseLocale Double Free
add CVEs
Fix potential segfault in dns_get_record()
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.30 rc1
Conflicts:
ext/intl/locale/locale_methods.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_help.c')
0 files changed, 0 insertions, 0 deletions