dmitry Fri Aug 12 09:10:00 2005 EDT
Modified files:
/php-src/ext/spl spl_iterators.c
Log:
Unicode support
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.76&r2=1.77&ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.76
php-src/ext/spl/spl_iterators.c:1.77
--- php-src/ext/spl/spl_iterators.c:1.76 Fri Aug 12 07:29:33 2005
+++ php-src/ext/spl/spl_iterators.c Fri Aug 12 09:09:58 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.76 2005/08/12 11:29:33 dmitry Exp $ */
+/* $Id: spl_iterators.c,v 1.77 2005/08/12 13:09:58 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -949,6 +949,10 @@
if (intern->current.data) {
if (intern->current.key_type == HASH_KEY_IS_STRING) {
RETURN_STRINGL(intern->current.str_key,
intern->current.str_key_len-1, 1);
+ } else if (intern->current.key_type == HASH_KEY_IS_BINARY) {
+ RETURN_BINARYL(intern->current.str_key,
intern->current.str_key_len-1, 1);
+ } else if (intern->current.key_type == HASH_KEY_IS_UNICODE) {
+ RETURN_UNICODEL(intern->current.str_key,
intern->current.str_key_len-1, 1);
} else {
RETURN_LONG(intern->current.int_key);
}
@@ -1911,6 +1915,14 @@
add_assoc_zval_ex(return_value, str_key,
str_key_len, *data);
efree(str_key);
break;
+ case HASH_KEY_IS_BINARY:
+ add_u_assoc_zval_ex(return_value, IS_BINARY,
str_key, str_key_len, *data);
+ efree(str_key);
+ break;
+ case HASH_KEY_IS_UNICODE:
+ add_u_assoc_zval_ex(return_value, IS_UNICODE,
str_key, str_key_len, *data);
+ efree(str_key);
+ break;
case HASH_KEY_IS_LONG:
add_index_zval(return_value, int_key, *data);
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
