Revert "Merge branch 'PHP-7.4'"

This reverts commit 046dcfb531e242d36a7af2942b9b148290c3c7fe, due to
segfaults on Travis.  This needs to be investigated.

6 files changed, 4 insertions, 41 deletions

diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h
index a1e6517909..c561e0fdf2 100644
--- a/Zend/zend_portability.h
+++ b/Zend/zend_portability.h
@@ -610,12 +610,4 @@ extern "C++" {
 # define ZEND_PREFER_RELOAD
 #endif
 
-#if defined(ZEND_WIN32) && defined(_DEBUG) && defined(PHP_WIN32_DEBUG_HEAP)
-# define ZEND_IGNORE_LEAKS_BEGIN() _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) & ~_CRTDBG_ALLOC_MEM_DF)
-# define ZEND_IGNORE_LEAKS_END() _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | _CRTDBG_ALLOC_MEM_DF)
-#else
-# define ZEND_IGNORE_LEAKS_BEGIN()
-# define ZEND_IGNORE_LEAKS_END()
-#endif
-
 #endif /* ZEND_PORTABILITY_H */
diff --git a/Zend/zend_strtod.c b/Zend/zend_strtod.c
index 2228e2262c..08f8424e8c 100644
--- a/Zend/zend_strtod.c
+++ b/Zend/zend_strtod.c
@@ -546,7 +546,6 @@ Bigint {
  static Bigint *freelist[Kmax+1];
 
 static void destroy_freelist(void);
-static void free_p5s(void);
 
 #ifdef ZTS
 static MUTEX_T dtoa_mutex;
@@ -565,8 +564,6 @@ ZEND_API int zend_startup_strtod(void) /* {{{ */
 ZEND_API int zend_shutdown_strtod(void) /* {{{ */
 {
 	destroy_freelist();
-	free_p5s();
-
 #ifdef ZTS
 	tsrm_mutex_free(dtoa_mutex);
 	dtoa_mutex = NULL;
@@ -4543,19 +4540,6 @@ static void destroy_freelist(void)
 	FREE_DTOA_LOCK(0)
 }
 
-static void free_p5s(void)
-{
-	Bigint **listp, *tmp;
-
-	ACQUIRE_DTOA_LOCK(1)
-	listp = &p5s;
-	while ((tmp = *listp) != NULL) {
-		*listp = tmp->next;
-		free(tmp);
-	}
-	FREE_DTOA_LOCK(1)
-}
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 32d00e7af4..a30b8ed469 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -59414,17 +59414,13 @@ void zend_vm_init(void)
 	VM_TRACE_START();
 }
 
-static HashTable *zend_handlers_table = NULL;
-
 void zend_vm_dtor(void)
 {
 	VM_TRACE_END();
-	if (zend_handlers_table) {
-		zend_hash_destroy(zend_handlers_table);
-		free(zend_handlers_table);
-	}
 }
 
+static HashTable *zend_handlers_table = NULL;
+
 static void init_opcode_serialiser(void)
 {
 	int i;
diff --git a/Zend/zend_vm_execute.skl b/Zend/zend_vm_execute.skl
index 3e520e9bac..27aae16391 100644
--- a/Zend/zend_vm_execute.skl
+++ b/Zend/zend_vm_execute.skl
@@ -67,17 +67,13 @@ void {%INITIALIZER_NAME%}(void)
 	VM_TRACE_START();
 }
 
-static HashTable *zend_handlers_table = NULL;
-
 void zend_vm_dtor(void)
 {
 	VM_TRACE_END();
-	if (zend_handlers_table) {
-		zend_hash_destroy(zend_handlers_table);
-		free(zend_handlers_table);
-	}
 }
 
+static HashTable *zend_handlers_table = NULL;
+
 static void init_opcode_serialiser(void)
 {
 	int i;
diff --git a/ext/libxml/config.w32 b/ext/libxml/config.w32
index dd91c4b893..b11c57bc44 100644
--- a/ext/libxml/config.w32
+++ b/ext/libxml/config.w32
@@ -16,9 +16,6 @@ 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 3206bbe162..01dc753c7e 100644
--- a/ext/libxml/libxml.c
+++ b/ext/libxml/libxml.c
@@ -724,9 +724,7 @@ 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);