cvs: php-src /ext/standard basic_functions.c

From: Date: Mon, 18 Dec 2006 22:59:36 +0000
Subject: cvs: php-src /ext/standard basic_functions.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-42156@lists.php.net to get a copy of this message
bjori Mon Dec 18 22:59:36 2006 UTC Modified files: /php-src/ext/standard basic_functions.c Log: Fix ZTS http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.837&r2=1.838&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.837 php-src/ext/standard/basic_functions.c:1.838 --- php-src/ext/standard/basic_functions.c:1.837 Mon Dec 18 20:47:57 2006 +++ php-src/ext/standard/basic_functions.c Mon Dec 18 22:59:36 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.837 2006/12/18 20:47:57 andrei Exp $ */ +/* $Id: basic_functions.c,v 1.838 2006/12/18 22:59:36 bjori Exp $ */ #include "php.h" #include "php_streams.h" @@ -6126,6 +6126,7 @@ static void php_simple_ini_parser_cb(zval *arg1, zval *arg2, int callback_type, zval *arr) { zval *element; + TSRMLS_FETCH(); switch (callback_type) { @@ -6146,7 +6147,7 @@ int key_len; if (UG(unicode)) { - if (zend_string_to_unicode(UG(utf8_conv), &key.u, &key_len, Z_STRVAL_P(arg1), Z_STRLEN_P(arg1)) == FAILURE) { + if (zend_string_to_unicode(UG(utf8_conv), &key.u, &key_len, Z_STRVAL_P(arg1), Z_STRLEN_P(arg1) TSRMLS_CC) == FAILURE) { return; } } else { @@ -6177,7 +6178,7 @@ int key_len; if (UG(unicode)) { - if (zend_string_to_unicode(UG(utf8_conv), &key.u, &key_len, Z_STRVAL_P(arg1), Z_STRLEN_P(arg1)) == FAILURE) { + if (zend_string_to_unicode(UG(utf8_conv), &key.u, &key_len, Z_STRVAL_P(arg1), Z_STRLEN_P(arg1) TSRMLS_CC) == FAILURE) { return; } } else { @@ -6239,7 +6240,7 @@ int key_len; if (UG(unicode)) { - if (zend_string_to_unicode(UG(utf8_conv), &key.u, &key_len, Z_STRVAL_P(arg1), Z_STRLEN_P(arg1)) == FAILURE) { + if (zend_string_to_unicode(UG(utf8_conv), &key.u, &key_len, Z_STRVAL_P(arg1), Z_STRLEN_P(arg1) TSRMLS_CC) == FAILURE) { return; } } else {

« previous php.cvs (#42156) next »