summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2012-06-13 19:25:04 (GMT)
committerStanislav Malyshev <stas@php.net>2012-06-13 19:26:14 (GMT)
commit74916d8ec86f10cf5efd91559e956da191dfe3e7 (patch)
treee07f2fb351933fdc64cb9a797ed28ff39fa6e396 /ext
parent784b4cddc6fc8170c7992d66f70438d2d4353acf (diff)
parentfef691b142ae1b2a4c93de4f57a757a3d073c7cb (diff)
downloadphp-74916d8ec86f10cf5efd91559e956da191dfe3e7.tar.gz
Merge branch 'PHP-5.4'
Merge reverts from 5.4, but shouldn't actually revert anything * PHP-5.4: Merge PHP 5.3.14 NEWS re-add 61755 to NEWS re-add 61755 to NEWS Revert "Add PBKDF2 support via openssl()" Revert "Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell." add CVE
Diffstat (limited to 'ext')
0 files changed, 0 insertions, 0 deletions