diff options
author | Pierre Joye <pierre.php@gmail.com> | 2013-04-09 10:04:17 +0200 |
---|---|---|
committer | Pierre Joye <pierre.php@gmail.com> | 2013-04-09 10:04:17 +0200 |
commit | 10d62de4aadd83638967ff86dcb2f94688f8dece (patch) | |
tree | 1f3d1e18f3fdf58fd2ba9830fc212dd1ff8daaf7 /ext/zip/php_zip.c | |
parent | a35d38661225ed171141e3818362a2ee5d63ec2a (diff) | |
parent | 4d4adf47e0a31f56e7c2ecf777895de3d70b05ea (diff) | |
download | php-git-10d62de4aadd83638967ff86dcb2f94688f8dece.tar.gz |
Merge branch 'PHP-5.3' into PHP-5.4
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.3:
fix null deref
Fixed bugs #47675 and #64577 (fd leak on Solaris)
Diffstat (limited to 'ext/zip/php_zip.c')
0 files changed, 0 insertions, 0 deletions