diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-01-23 11:48:20 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-01-23 11:48:20 +0100 |
| commit | 046dcfb531e242d36a7af2942b9b148290c3c7fe (patch) | |
| tree | 85a6b5ac8f9fd1433bd066a7505147d0d3c433f1 /ext/libxml | |
| parent | a698e36aa851404a1bc4561e1ee299115c814c67 (diff) | |
| parent | 4130fe437a5db7ead1444d3748bd0fbad9829cb2 (diff) | |
| download | php-git-046dcfb531e242d36a7af2942b9b148290c3c7fe.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Make MSVCRT memory leak checking usable for the test suite
Diffstat (limited to 'ext/libxml')
| -rw-r--r-- | ext/libxml/config.w32 | 3 | ||||
| -rw-r--r-- | ext/libxml/libxml.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/ext/libxml/config.w32 b/ext/libxml/config.w32 index b11c57bc44..dd91c4b893 100644 --- a/ext/libxml/config.w32 +++ b/ext/libxml/config.w32 @@ -16,6 +16,9 @@ if (PHP_LIBXML == "yes") { ADD_DEF_FILE("ext\\libxml\\php_libxml2.def"); } PHP_INSTALL_HEADERS("ext/libxml/", "php_libxml.h"); + if (PHP_CRT_DEBUG == "yes") { + ADD_FLAG("CFLAGS_LIBXML", "/D PHP_WIN32_DEBUG_HEAP"); + } } else { WARNING("libxml support can't be enabled, iconv or libxml are missing") PHP_LIBXML = "no" diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c index 01dc753c7e..3206bbe162 100644 --- a/ext/libxml/libxml.c +++ b/ext/libxml/libxml.c @@ -724,7 +724,9 @@ PHP_LIBXML_API void php_libxml_initialize(void) { if (!_php_libxml_initialized) { /* we should be the only one's to ever init!! */ + ZEND_IGNORE_LEAKS_BEGIN(); xmlInitParser(); + ZEND_IGNORE_LEAKS_END(); _php_libxml_default_entity_loader = xmlGetExternalEntityLoader(); xmlSetExternalEntityLoader(_php_libxml_pre_ext_ent_loader); |