diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-04-14 13:35:00 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-04-14 13:35:24 -0700 |
| commit | 8bc82718aecf60696d2d0a9517403f8a282e3573 (patch) | |
| tree | 8717a2312856a4b2ed2edf5ea1df0c6fe5042f42 /sapi/cli/php_cli_server.c | |
| parent | 22acea99ff3456abf316e838bfdabe37628e36f8 (diff) | |
| parent | a186312832207437e4783024dcdece5232ac6c39 (diff) | |
| download | php-git-8bc82718aecf60696d2d0a9517403f8a282e3573.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix #66942: openssl_seal() memory leak
ws fix
Conflicts:
ext/openssl/openssl.c
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions