diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-04-14 11:12:58 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-04-14 11:12:58 -0700 |
| commit | 9d7b5e30ebbac1a250e794da1e845db800ec20ce (patch) | |
| tree | 73d276e34f91a28c0390593d7798ad2495f0786c /ext/zip/php_zip.h | |
| parent | b9940ab1bd03716459b48e0d21a63ecad283f460 (diff) | |
| parent | df33731812e1ac83a4f25c92b9a05d23f4b12550 (diff) | |
| download | php-git-9d7b5e30ebbac1a250e794da1e845db800ec20ce.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed recently introduced memory leak
Fix Bug #69402: Reading empty SSL stream hangs until timeout
Diffstat (limited to 'ext/zip/php_zip.h')
0 files changed, 0 insertions, 0 deletions