summaryrefslogtreecommitdiff
path: root/ext/libxml
diff options
context:
space:
mode:
Diffstat (limited to 'ext/libxml')
-rw-r--r--ext/libxml/config.w323
-rw-r--r--ext/libxml/libxml.c2
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 333dab4856..360d1999e7 100644
--- a/ext/libxml/libxml.c
+++ b/ext/libxml/libxml.c
@@ -752,7 +752,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);