]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 25e3e78 de65eaa)
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Mon, 1 Dec 2014 02:32:56 +0000 (18:32 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 1 Dec 2014 02:32:56 +0000 (18:32 -0800)
commitc64949626dd21ec571f48a54d187da4c9ad312b7
treeec3fef90ff28ffc233af65bd2e8aff92d7aa1232tree | snapshot
parent25e3e78016572cf86e4dff7bb0179f639abd5603commit | diff
parentde65eaa8c8faf6ae256aef3a2a074255b249a6f0commit | diff
Merge branch 'PHP-5.6'

* PHP-5.6:
  Adds test cases for openssl EC improvements
  Adds better handling of EC keys: OPENSSL_KEYTYPE_EC
  Fixes memory leak introduced in 2b9af967

Conflicts:
ext/openssl/openssl.c
ext/date/php_date.c diff1 | diff2 | blob | history
ext/openssl/openssl.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.