diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-11-30 18:18:30 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-11-30 18:24:23 -0800 |
| commit | 8c08124c0ea18bc45c1b64a33953029c2c91d658 (patch) | |
| tree | 645cb4f96f8f1f88e3ce87d67b9c0bf54033f5c9 /ext/ftp/php_ftp.c | |
| parent | aae5d4d9db27a11f9118546fa16c57132704b889 (diff) | |
| parent | 6048ac32b4e8fc5dacb89af7e4408e3116609317 (diff) | |
| download | php-git-8c08124c0ea18bc45c1b64a33953029c2c91d658.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Adds test cases for openssl EC improvements
Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
Diffstat (limited to 'ext/ftp/php_ftp.c')
0 files changed, 0 insertions, 0 deletions