diff options
| author | Chris Wright <daverandom@php.net> | 2014-08-27 16:01:18 +0100 |
|---|---|---|
| committer | Chris Wright <daverandom@php.net> | 2014-08-27 16:01:18 +0100 |
| commit | 30a73658c63a91c413305a4c4d49882fda4dab3e (patch) | |
| tree | c469bb31d9c2a2729a4397b02ed0740170538c6f /ext/zip/php_zip.c | |
| parent | 7fac56e0729385bbd2bb040f06a20a697d9de5fd (diff) | |
| parent | 32be79dcfa1bc5af8682d9f512da68c5b3e2cbf3 (diff) | |
| download | php-git-30a73658c63a91c413305a4c4d49882fda4dab3e.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix stream_select() issue with OpenSSL buffer
Conflicts:
ext/openssl/xp_ssl.c
Diffstat (limited to 'ext/zip/php_zip.c')
0 files changed, 0 insertions, 0 deletions