diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-02-01 00:09:44 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-02-01 00:09:44 -0800 |
| commit | c0237617e10ef66978ba1eb841853c869ef8e181 (patch) | |
| tree | f0b9225e98c6910dde09dae2f7520356126c6601 /ext/mysql/php_mysql.c | |
| parent | d893814b58f94e1d18345cd3de3428a01d2be8e8 (diff) | |
| parent | 463611714c7a9a91ed190802ede60068593f8495 (diff) | |
| download | php-git-c0237617e10ef66978ba1eb841853c869ef8e181.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix bug #64938: libxml_disable_entity_loader setting is shared between threads
Conflicts:
ext/libxml/libxml.c
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions