]> granicus.if.org Git - php/commit
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)
commit0841eca580d7914eaadeb4270d48f72c5c42ba2c
tree60735efec89d6004d11aded5f2038a2c5b2a124e
parent432d59ab5560202a46b01d05455418e9fc810365
parent7b0107cc5d3d90655957680ef9cf916dce6875a7
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix bug #61930: openssl corrupts ssl key resource when using openssl_get_publickey()
ext/openssl/openssl.c