cvs: php-src /ext/spl spl_iterators.c
| From: | Dmitry Stogov | Date: | Mon, 17 Jul 2006 06:46:19 +0000 |
| Subject: | cvs: php-src /ext/spl spl_iterators.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-39299@lists.php.net to get a copy of this message | ||
dmitry Mon Jul 17 06:46:19 2006 UTC
Modified files:
/php-src/ext/spl spl_iterators.c
Log:
ZTS fix
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.138&r2=1.139&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.138 php-src/ext/spl/spl_iterators.c:1.139
--- php-src/ext/spl/spl_iterators.c:1.138 Sun Jul 16 20:52:20 2006
+++ php-src/ext/spl/spl_iterators.c Mon Jul 17 06:46:19 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.138 2006/07/16 20:52:20 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.139 2006/07/17 06:46:19 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -1401,7 +1401,7 @@
use_copy = 0;
} else if (intern->current.key_type == HASH_KEY_IS_UNICODE) {
subject_len = intern->current.str_key_len - 1;
- subject = zend_unicode_to_ascii(intern->current.str_key.u, subject_len TSRMLS_DC);
+ subject = zend_unicode_to_ascii(intern->current.str_key.u, subject_len TSRMLS_CC);
if (!subject) {
/* FIXME: Unicode support??? : how to handle this error, with that exception? */
if (intern->u.regex.mode != REGIT_MODE_MATCH) {