diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2013-04-09 10:04:32 +0200 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2013-04-09 10:04:32 +0200 |
| commit | 4d6c367177e58b238de67133edff6f14c0a2343b (patch) | |
| tree | 229427e0473f9c94bdbdf55964fab02eea3f8729 /ext/zip/php_zip.c | |
| parent | 83500123d02789781c25691527ae720ba1587948 (diff) | |
| parent | 10d62de4aadd83638967ff86dcb2f94688f8dece (diff) | |
| download | php-git-4d6c367177e58b238de67133edff6f14c0a2343b.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.4:
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