summaryrefslogtreecommitdiff
path: root/ext/xmlreader/php_xmlreader.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2013-02-17 13:29:34 -0800
committerStanislav Malyshev <stas@php.net>2013-02-17 13:29:34 -0800
commit0841eca580d7914eaadeb4270d48f72c5c42ba2c (patch)
tree60735efec89d6004d11aded5f2038a2c5b2a124e /ext/xmlreader/php_xmlreader.c
parent432d59ab5560202a46b01d05455418e9fc810365 (diff)
parent7b0107cc5d3d90655957680ef9cf916dce6875a7 (diff)
downloadphp-git-0841eca580d7914eaadeb4270d48f72c5c42ba2c.tar.gz
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()
Diffstat (limited to 'ext/xmlreader/php_xmlreader.c')
0 files changed, 0 insertions, 0 deletions