arpad Tue, 13 Sep 2011 23:07:08 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=316689
Log:
fix zts break in r316688
Changed paths:
U php/php-src/branches/PHP_5_4/ext/session/session.c
U php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c
U php/php-src/branches/PHP_5_4/ext/standard/basic_functions.h
U php/php-src/trunk/ext/session/session.c
U php/php-src/trunk/ext/standard/basic_functions.c
U php/php-src/trunk/ext/standard/basic_functions.h
Modified: php/php-src/branches/PHP_5_4/ext/session/session.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/session/session.c 2011-09-13 22:28:15 UTC (rev 316688)
+++ php/php-src/branches/PHP_5_4/ext/session/session.c 2011-09-13 23:07:08 UTC (rev 316689)
@@ -1638,7 +1638,7 @@
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 @@
}
} 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 @@
}
/* 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 @@
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);
Modified: php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c 2011-09-13 22:28:15 UTC (rev 316688)
+++ php/php-src/branches/PHP_5_4/ext/standard/basic_functions.c 2011-09-13 23:07:08 UTC (rev 316689)
@@ -5073,7 +5073,7 @@
}
/* }}} */
-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 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 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));
Modified: php/php-src/branches/PHP_5_4/ext/standard/basic_functions.h
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/basic_functions.h 2011-09-13 22:28:15 UTC (rev 316688)
+++ php/php-src/branches/PHP_5_4/ext/standard/basic_functions.h 2011-09-13 23:07:08 UTC (rev 316689)
@@ -256,8 +256,8 @@
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 */
Modified: php/php-src/trunk/ext/session/session.c
===================================================================
--- php/php-src/trunk/ext/session/session.c 2011-09-13 22:28:15 UTC (rev 316688)
+++ php/php-src/trunk/ext/session/session.c 2011-09-13 23:07:08 UTC (rev 316689)
@@ -1638,7 +1638,7 @@
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 @@
}
} 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 @@
}
/* 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 @@
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);
Modified: php/php-src/trunk/ext/standard/basic_functions.c
===================================================================
--- php/php-src/trunk/ext/standard/basic_functions.c 2011-09-13 22:28:15 UTC (rev 316688)
+++ php/php-src/trunk/ext/standard/basic_functions.c 2011-09-13 23:07:08 UTC (rev 316689)
@@ -5108,7 +5108,7 @@
}
/* }}} */
-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 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 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));
Modified: php/php-src/trunk/ext/standard/basic_functions.h
===================================================================
--- php/php-src/trunk/ext/standard/basic_functions.h 2011-09-13 22:28:15 UTC (rev 316688)
+++ php/php-src/trunk/ext/standard/basic_functions.h 2011-09-13 23:07:08 UTC (rev 316689)
@@ -256,8 +256,8 @@
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 */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
