summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2015-02-01 00:08:46 -0800
committerStanislav Malyshev <stas@php.net>2015-02-01 00:09:04 -0800
commit463611714c7a9a91ed190802ede60068593f8495 (patch)
treeabd8eee99cab7c95fd079ab52d9608724128490c /ext/mysql/php_mysql.c
parentc5526291cedcb6b5c48d6f13cc7481f8eea9761a (diff)
parentde31324c221c1791b26350ba106cc26bad23ace9 (diff)
downloadphp-git-463611714c7a9a91ed190802ede60068593f8495.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Fix bug #64938: libxml_disable_entity_loader setting is shared between threads
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions