summaryrefslogtreecommitdiff
path: root/ext/mysqlnd/php_mysqlnd.c
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2012-09-11 16:39:39 -0700
committerChristopher Jones <sixd@php.net>2012-09-11 16:39:39 -0700
commitc36d92733151bfab4b741ddb09d572759732d857 (patch)
tree1632c05a79f85d006a0f4a00c4ca4fe7ed68e625 /ext/mysqlnd/php_mysqlnd.c
parentbdf237940053fa4f448c18910f82e17f10841753 (diff)
parent328a3d9f1384d3555833345dbe879e4d99922a35 (diff)
downloadphp-git-c36d92733151bfab4b741ddb09d572759732d857.tar.gz
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/repository/php-src: regenerate patch, and save a strlen Fix the wrong use of snprintf which is introduced in 1d2f61904987133d542c68cd349cf313d0bef1c8 Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
0 files changed, 0 insertions, 0 deletions