summaryrefslogtreecommitdiff
path: root/ext/zip/php_zip.c
diff options
context:
space:
mode:
authorChris Wright <daverandom@php.net>2014-08-27 16:06:28 +0100
committerChris Wright <daverandom@php.net>2014-08-27 16:06:28 +0100
commitdb03216e62180000d7296c0498f7141ce62f66d8 (patch)
tree3ebc30774bc816a1fa7de8b5aec1d7411ab917f6 /ext/zip/php_zip.c
parent4d667eeaf39853c4c7cbae9f5eaad40c704bffe8 (diff)
parent30a73658c63a91c413305a4c4d49882fda4dab3e (diff)
downloadphp-git-db03216e62180000d7296c0498f7141ce62f66d8.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Fix stream_select() issue with OpenSSL buffer
Diffstat (limited to 'ext/zip/php_zip.c')
0 files changed, 0 insertions, 0 deletions