summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2015-01-31 19:08:37 -0800
committerStanislav Malyshev <stas@php.net>2015-01-31 19:08:37 -0800
commit237128603f99a97da9d0d261b8d0849f27b4c7b8 (patch)
treeb22950edbec46949e587be43acc15fa4100bd5e1 /ext/mysql/php_mysql.c
parentc8a12508c748a546d9dab14b3eb2c4a94ca279cc (diff)
parent0f9c708229d7d4f4eff96c30cff7a2339f738511 (diff)
downloadphp-git-237128603f99a97da9d0d261b8d0849f27b4c7b8.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Add mitigation for CVE-2015-0235 (bug #68925)
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions