diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-05-20 14:10:19 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-05-20 14:11:42 +0200 |
| commit | a582931f4255a0a022f06da613558482beeb5451 (patch) | |
| tree | 7b558705201dd2caaaa6eda0d67cc165d8f2f00b /ext/libxml | |
| parent | 466e288b016a5eadb166af4b49c7d148948ec2d5 (diff) | |
| download | php-git-a582931f4255a0a022f06da613558482beeb5451.tar.gz | |
Revert "Revert "Merge branch 'PHP-7.4'""
This reverts commit 28e650a, which reverted commit 046dcfb, which had
to be reverted due to phpdbg issues. The culprit was that we did not
properly reset `zend_handler_table` to `NULL`, which is required for
SAPIs which may restart the engine after shutdown.
[1] <http://git.php.net/?p=php-src.git;a=commit;h=28e650abf8097a28789a005e5028fee095359583>
[2] <http://git.php.net/?p=php-src.git;a=commit;h=046dcfb531e242d36a7af2942b9b148290c3c7fe>
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 18da8b67da..85eaf7a026 100644 --- a/ext/libxml/libxml.c +++ b/ext/libxml/libxml.c @@ -700,7 +700,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); |