summaryrefslogtreecommitdiff
path: root/ext/zip/lib/zip_source_zip.c
diff options
context:
space:
mode:
authorMichael Wallner <mike@php.net>2013-10-21 22:16:21 +0200
committerMichael Wallner <mike@php.net>2013-10-21 22:16:21 +0200
commitcfd911473bb6b6a34dffbd7b12b1d97278683264 (patch)
treeea33ce314ec2fc81eaeb1ca88704ecc128a334d3 /ext/zip/lib/zip_source_zip.c
parent605b3c2ca1b8d29125f49a14b08f848368fc3d17 (diff)
parent757f4a952ce77b7892b38e177fa78de8e2f54128 (diff)
downloadphp-git-cfd911473bb6b6a34dffbd7b12b1d97278683264.tar.gz
Merge branch 'PHP-5.5'
* PHP-5.5: add tests for bug #62523 Merged PR #293 (Exif crash on unknown encoding was fixed) By: Draal Conflicts: configure.in main/php_version.h
Diffstat (limited to 'ext/zip/lib/zip_source_zip.c')
0 files changed, 0 insertions, 0 deletions