diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-04-14 00:34:02 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-04-14 00:34:02 -0700 |
| commit | e21f87e9578884b8cc7914d1e68aca0a0b54c8b7 (patch) | |
| tree | c69285a8d57f0aa7368036259c3e0f8c80ae9138 /Zend/zend_exceptions.c | |
| parent | 100614da271f898384cea4b2b1cead39a0dc8ccd (diff) | |
| parent | e10272c628a1163fb493910bdd1bb47b6c730813 (diff) | |
| download | php-git-e21f87e9578884b8cc7914d1e68aca0a0b54c8b7.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
5.4.41 next
fix CVE num
update NEWS
Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
fix type in fix for #69085
fix CVE num
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'Zend/zend_exceptions.c')
0 files changed, 0 insertions, 0 deletions