]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5'
authorStanislav Malyshev <stas@php.net>
Sun, 17 Feb 2013 21:30:04 +0000 (13:30 -0800)
committerStanislav Malyshev <stas@php.net>
Sun, 17 Feb 2013 21:30:04 +0000 (13:30 -0800)
commit1307c6c1976276cddbcad868d343523c0d4cb83f
tree3ae545cfb098c4597a13647f3685237ef41ac61c
parent9a85dca7a566cef6bee9f07dbf9c6059dabb135c
parent0841eca580d7914eaadeb4270d48f72c5c42ba2c
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix bug #61930: openssl corrupts ssl key resource when using openssl_get_publickey()