diff options
| author | Arpad Ray <arpad@php.net> | 2011-09-13 23:07:08 +0000 |
|---|---|---|
| committer | Arpad Ray <arpad@php.net> | 2011-09-13 23:07:08 +0000 |
| commit | 45a96e0d5b0695902fdd398b538d9e32b69e0af3 (patch) | |
| tree | 0ffb371d6adf76f3ffca964c5afde702258a053d | |
| parent | 5bc97c6cfaab487504a6330368d2c0b0eef716c0 (diff) | |
| download | php-git-45a96e0d5b0695902fdd398b538d9e32b69e0af3.tar.gz | |
fix zts break in r316688
| -rw-r--r-- | ext/session/session.c | 8 | ||||
| -rw-r--r-- | ext/standard/basic_functions.c | 6 | ||||
| -rw-r--r-- | ext/standard/basic_functions.h | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index bd4efd0cdb..ac3fda0a69 100644 --- 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 cc563ede0a..277f33eb1e 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -5108,7 +5108,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)); @@ -5119,7 +5119,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; @@ -5129,7 +5129,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 32b6d51317..9e68fd4f77 100644 --- 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 */ |