]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 432d59a 7b0107c)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Sun, 17 Feb 2013 21:29:34 +0000 (13:29 -0800)
committerStanislav Malyshev <stas@php.net>
Sun, 17 Feb 2013 21:29:34 +0000 (13:29 -0800)
* PHP-5.4:
  fix bug #61930: openssl corrupts ssl key resource when using openssl_get_publickey()

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.