fix zts break in r316688

diff --git a/ext/session/session.c b/ext/session/session.c
index bd4efd0cdb25ea9c68827a9a65b63cc7a58169d7..ac3fda0a6988dc3b992c96225aad94c78ededd6c 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -1638,7 +1638,7 @@ static PHP_FUNCTION(session_set_save_handler)
                        shutdown_function_entry.arguments[0] = callback;
 
                        /* add shutdown function, removing the old one if it exists */
-                       if (!register_user_shutdown_function("session_shutdown", &shutdown_function_entry)) {
+                       if (!register_user_shutdown_function("session_shutdown", &shutdown_function_entry TSRMLS_CC)) {
                                zval_ptr_dtor(&callback);
                                efree(shutdown_function_entry.arguments);
                                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to register session shutdown function");
@@ -1646,7 +1646,7 @@ static PHP_FUNCTION(session_set_save_handler)
                        }
                } else {
                        /* remove shutdown function */
-                       remove_user_shutdown_function("session_shutdown");
+                       remove_user_shutdown_function("session_shutdown" TSRMLS_CC);
                }
 
                PS(mod_user_implemented) = 1;
@@ -1662,7 +1662,7 @@ static PHP_FUNCTION(session_set_save_handler)
        }
 
        /* remove shutdown function */
-       remove_user_shutdown_function("session_shutdown");
+       remove_user_shutdown_function("session_shutdown" TSRMLS_CC);
 
        for (i = 0; i < 6; i++) {
                if (!zend_is_callable(*args[i], 0, &name TSRMLS_CC)) {
@@ -1946,7 +1946,7 @@ static PHP_FUNCTION(session_register_shutdown)
        ZVAL_STRING(callback, "session_write_close", 1);
        shutdown_function_entry.arguments[0] = callback;
 
-       if (!append_user_shutdown_function(shutdown_function_entry)) {
+       if (!append_user_shutdown_function(shutdown_function_entry TSRMLS_CC)) {
                zval_ptr_dtor(&callback);
                efree(shutdown_function_entry.arguments);
 

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index b8b53ddea3a60ee7a6d814106413df27790ee2e9..d06c0c676a80474ff490f07d6bd3cd62bfcf6cf1 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -5073,7 +5073,7 @@ PHP_FUNCTION(register_shutdown_function)
 }
 /* }}} */
 
-PHPAPI zend_bool register_user_shutdown_function(char *function_name, php_shutdown_function_entry *shutdown_function_entry) /* {{{ */
+PHPAPI zend_bool register_user_shutdown_function(char *function_name, php_shutdown_function_entry *shutdown_function_entry TSRMLS_DC) /* {{{ */
 {
        if (!BG(user_shutdown_function_names)) {
                ALLOC_HASHTABLE(BG(user_shutdown_function_names));
@@ -5084,7 +5084,7 @@ PHPAPI zend_bool register_user_shutdown_function(char *function_name, php_shutdo
 }
 /* }}} */
 
-PHPAPI zend_bool remove_user_shutdown_function(char *function_name) /* {{{ */
+PHPAPI zend_bool remove_user_shutdown_function(char *function_name TSRMLS_DC) /* {{{ */
 {
        if (BG(user_shutdown_function_names)) {
                return zend_hash_del_key_or_index(BG(user_shutdown_function_names), function_name, sizeof(function_name), 0, HASH_DEL_KEY) != FAILURE;
@@ -5094,7 +5094,7 @@ PHPAPI zend_bool remove_user_shutdown_function(char *function_name) /* {{{ */
 }
 /* }}} */
 
-PHPAPI zend_bool append_user_shutdown_function(php_shutdown_function_entry shutdown_function_entry) /* {{{ */
+PHPAPI zend_bool append_user_shutdown_function(php_shutdown_function_entry shutdown_function_entry TSRMLS_DC) /* {{{ */
 {
        if (!BG(user_shutdown_function_names)) {
                ALLOC_HASHTABLE(BG(user_shutdown_function_names));

diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h
index 32b6d513172c3da5fd9b021503710aa7de7cbbfa..9e68fd4f7783081d2a8a6d1c61092c33653175fc 100644 (file)
--- a/ext/standard/basic_functions.h
+++ b/ext/standard/basic_functions.h
@@ -256,8 +256,8 @@ typedef struct _php_shutdown_function_entry {
        int arg_count;
 } php_shutdown_function_entry;
 
-PHPAPI extern zend_bool register_user_shutdown_function(char *function_name, php_shutdown_function_entry *shutdown_function_entry);
-PHPAPI extern zend_bool remove_user_shutdown_function(char *function_name);
-PHPAPI extern zend_bool append_user_shutdown_function(php_shutdown_function_entry shutdown_function_entry);
+PHPAPI extern zend_bool register_user_shutdown_function(char *function_name, php_shutdown_function_entry *shutdown_function_entry TSRMLS_DC);
+PHPAPI extern zend_bool remove_user_shutdown_function(char *function_name TSRMLS_DC);
+PHPAPI extern zend_bool append_user_shutdown_function(php_shutdown_function_entry shutdown_function_entry TSRMLS_DC);
 
 #endif /* BASIC_FUNCTIONS_H */