moved ext/filter to use the static tsrmls pointer

Author: weltling

ext/filter/config.m4

@@ -39,7 +39,7 @@ yes
     CPPFLAGS=$old_CPPFLAGS
   fi
 
-  PHP_NEW_EXTENSION(filter, filter.c sanitizing_filters.c logical_filters.c callback_filter.c, $ext_shared)
+  PHP_NEW_EXTENSION(filter, filter.c sanitizing_filters.c logical_filters.c callback_filter.c, $ext_shared, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
   PHP_SUBST(FILTER_SHARED_LIBADD)
 
   PHP_INSTALL_HEADERS([ext/filter/php_filter.h])

ext/filter/config.w32

@@ -4,6 +4,6 @@
 ARG_ENABLE("filter", "Filter Support", "yes");
 
 if (PHP_FILTER == "yes") {
-	EXTENSION("filter", "filter.c sanitizing_filters.c logical_filters.c callback_filter.c");
+	EXTENSION("filter", "filter.c sanitizing_filters.c logical_filters.c callback_filter.c", PHP_FILTER_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
 	PHP_INSTALL_HEADERS("ext/filter", "php_filter.h");
 }

ext/filter/filter.c

@@ -152,6 +152,9 @@ zend_module_entry filter_module_entry = {
 /* }}} */
 
 #ifdef COMPILE_DL_FILTER
+#ifdef ZTS
+ZEND_TSRMLS_CACHE_DEFINE;
+#endif
 ZEND_GET_MODULE(filter)
 #endif
 
@@ -191,6 +194,9 @@ PHP_INI_END()
 
 static void php_filter_init_globals(zend_filter_globals *filter_globals) /* {{{ */
 {
+#if defined(COMPILE_DL_FILTER) && defined(ZTS)
+ZEND_TSRMLS_CACHE_UPDATE;
+#endif
 	ZVAL_UNDEF(&filter_globals->post_array);
 	ZVAL_UNDEF(&filter_globals->get_array);
 	ZVAL_UNDEF(&filter_globals->cookie_array);

ext/filter/php_filter.h

@@ -64,7 +64,8 @@ ZEND_BEGIN_MODULE_GLOBALS(filter)
 ZEND_END_MODULE_GLOBALS(filter)
 
 #ifdef ZTS
-#define IF_G(v) TSRMG(filter_globals_id, zend_filter_globals *, v)
+#define IF_G(v) ZEND_TSRMG(filter_globals_id, zend_filter_globals *, v)
+ZEND_TSRMLS_CACHE_EXTERN;
 #else
 #define IF_G(v) (filter_globals.v)
 #endif