]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 734d887 65adb74)
Merge branch 'PHP-5.5' into PHP-5.6
authorDaniel Lowrey <rdlowrey@php.net>
Sat, 15 Feb 2014 01:20:01 +0000 (18:20 -0700)
committerDaniel Lowrey <rdlowrey@php.net>
Sat, 15 Feb 2014 01:20:01 +0000 (18:20 -0700)
* PHP-5.5:
  Fix for bug66501 - "key type not supported in this PHP build"

1  2 
ext/openssl/openssl.c patch | diff1 | diff2 | blob | history

diff --cc ext/openssl/openssl.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.