From: Antony Dovgal <tony2001@php.net>
Date: Wed, 24 May 2006 21:22:27 +0000 (+0000)
Subject: MFB: fix #37418 (tidy module crashes CLI version of PHP)
X-Git-Tag: BEFORE_NEW_OUTPUT_API~100
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2873c3a5ad2e445d9278d5fd60c940fc8c55171a;p=php

MFB: fix #37418 (tidy module crashes CLI version of PHP)
---

diff --git a/ext/tidy/php_tidy.h b/ext/tidy/php_tidy.h
index d038be2254..959273980f 100644
--- a/ext/tidy/php_tidy.h
+++ b/ext/tidy/php_tidy.h
@@ -40,6 +40,7 @@ extern zend_module_entry tidy_module_entry;
 #define TIDY_ATTR_ME(name, param) TIDY_METHOD_MAP(name, tam_ ##name, param)
 
 PHP_MINIT_FUNCTION(tidy);
+PHP_MSHUTDOWN_FUNCTION(tidy);
 PHP_RINIT_FUNCTION(tidy);
 PHP_MINFO_FUNCTION(tidy);
 
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 4de4555efe..71da10f2ef 100644
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -330,7 +330,7 @@ zend_module_entry tidy_module_entry = {
 	"tidy",
 	tidy_functions,
 	PHP_MINIT(tidy),
-	NULL,
+	PHP_MSHUTDOWN(tidy),
 	PHP_RINIT(tidy),
 	NULL,
 	PHP_MINFO(tidy),
@@ -993,6 +993,17 @@ PHP_RINIT_FUNCTION(tidy)
 	return SUCCESS;
 }
 
+PHP_MSHUTDOWN_FUNCTION(tidy)
+{
+#ifdef ZTS
+	ts_free_id(tidy_globals_id);
+#else
+	tidy_globals_dtor(&tidy_globals TSRMLS_CC);
+#endif
+	UNREGISTER_INI_ENTRIES();
+	return SUCCESS;
+}
+
 PHP_MINFO_FUNCTION(tidy)
 {
 	php_info_print_table_start();