summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2015-01-22 10:00:10 +0100
committerAnatol Belski <ab@php.net>2015-01-22 10:00:10 +0100
commitd0e75bdc591ea8d33a1b4d4cef3877583b8775e0 (patch)
tree638bc352fe613d43a10805ce67dec7474c94e12b /ext/mysql/php_mysql.c
parent24157f396cc8c309f47440ae0c96748e0be74a73 (diff)
parent91aa340180eccfc15d4a143b54d47b8120f898be (diff)
downloadphp-git-d0e75bdc591ea8d33a1b4d4cef3877583b8775e0.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Fixed bug #68827 Double free with disabled ZMM Fixed segfault while running with moodle
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions