summaryrefslogtreecommitdiff
path: root/ext/zip/php_zip.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2013-02-20 22:30:59 +0400
committerDmitry Stogov <dmitry@zend.com>2013-02-20 22:30:59 +0400
commit20c623c9be2ad9c408b991e805780ac1fc5493e8 (patch)
treef7226e2d6059f8a766fba738a8817bfd6690fb9e /ext/zip/php_zip.c
parentb157e05f573a2ec3b3344317c6a981f933ff4c9a (diff)
parentc737b89473df9dba6742b8fc8fbf6d009bf05c36 (diff)
downloadphp-git-20c623c9be2ad9c408b991e805780ac1fc5493e8.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Fixed external entity loading
Diffstat (limited to 'ext/zip/php_zip.c')
0 files changed, 0 insertions, 0 deletions