]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: aae5d4d 6048ac3)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 1 Dec 2014 02:18:30 +0000 (18:18 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 1 Dec 2014 02:24:23 +0000 (18:24 -0800)
commit8c08124c0ea18bc45c1b64a33953029c2c91d658
tree645cb4f96f8f1f88e3ce87d67b9c0bf54033f5c9tree | snapshot
parentaae5d4d9db27a11f9118546fa16c57132704b889commit | diff
parent6048ac32b4e8fc5dacb89af7e4408e3116609317commit | diff
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
NEWS diff1 | diff2 | blob | history
ext/openssl/openssl.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.