summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2013-05-14 09:41:38 +0200
committerAnatol Belski <ab@php.net>2013-05-14 09:41:38 +0200
commit933e01bbac894c219a56db9f378c60c0c93f3ca2 (patch)
tree44bfba3479ae29af0dbee5e5bb8be8f2e5369398 /ext/mysql/php_mysql.c
parente191cb63ba9a32c527263b3913e2f4e5d6dd8aa3 (diff)
parent74555e7c26b2c61bb8e67b7d6a6f4d2b8eb3a5f3 (diff)
downloadphp-git-933e01bbac894c219a56db9f378c60c0c93f3ca2.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Fixed bug #64830 mimetype detection segfaults on mp3 file
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions