moved tidy to use static tsrmls pointer

Author: weltling

ext/tidy/config.m4

@@ -38,7 +38,7 @@ if test "$PHP_TIDY" != "no"; then
   ],[],[])
 
 
-  PHP_NEW_EXTENSION(tidy, tidy.c, $ext_shared)
+  PHP_NEW_EXTENSION(tidy, tidy.c, $ext_shared, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
   PHP_SUBST(TIDY_SHARED_LIBADD)
   AC_DEFINE(HAVE_TIDY,1,[ ])
 fi

ext/tidy/config.w32

@@ -12,6 +12,7 @@ if (PHP_TIDY != "no") {
 			)) {
 		EXTENSION("tidy", "tidy.c");
 		AC_DEFINE('HAVE_TIDY', 1, 'Have TIDY library');
+		ADD_FLAG('CFLAGS_TIDY', '/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1');
 		if (!PHP_TIDY_SHARED) {
 			ADD_DEF_FILE("ext\\tidy\\php_tidy.def");
 		}

ext/tidy/php_tidy.h

@@ -40,7 +40,10 @@ ZEND_BEGIN_MODULE_GLOBALS(tidy)
 ZEND_END_MODULE_GLOBALS(tidy)
 
 #ifdef ZTS
-#define TG(v) TSRMG(tidy_globals_id, zend_tidy_globals *, v)
+#define TG(v) ZEND_TSRMG(tidy_globals_id, zend_tidy_globals *, v)
+#ifdef COMPILE_DL_TIDY
+ZEND_TSRMLS_CACHE_EXTERN;
+#endif
 #else
 #define TG(v) (tidy_globals.v)
 #endif

ext/tidy/tidy.c

@@ -467,6 +467,9 @@ zend_module_entry tidy_module_entry = {
 };
 
 #ifdef COMPILE_DL_TIDY
+#ifdef ZTS
+ZEND_TSRMLS_CACHE_DEFINE;
+#endif
 ZEND_GET_MODULE(tidy)
 #endif
 
@@ -1053,6 +1056,10 @@ static PHP_MINIT_FUNCTION(tidy)
 
 static PHP_RINIT_FUNCTION(tidy)
 {
+#if defined(COMPILE_DL_TIDY) && defined(ZTS)
+	ZEND_TSRMLS_CACHE_UPDATE;
+#endif
+
 	php_tidy_clean_output_start(ZEND_STRL("ob_tidyhandler") TSRMLS_CC);
 
 	return SUCCESS;