cvs: ZendEngine2 / zend_API.c
| From: | Dmitry Stogov | Date: | Tue, 16 Aug 2005 14:33:07 +0000 |
| Subject: | cvs: ZendEngine2 / zend_API.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-4020@lists.php.net to get a copy of this message | ||
dmitry Tue Aug 16 10:33:07 2005 EDT
Modified files:
/ZendEngine2 zend_API.c
Log:
Unicode support
http://cvs.php.net/diff.php/ZendEngine2/zend_API.c?r1=1.301&r2=1.302&ty=u
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.301 ZendEngine2/zend_API.c:1.302
--- ZendEngine2/zend_API.c:1.301 Mon Aug 15 10:39:18 2005
+++ ZendEngine2/zend_API.c Tue Aug 16 10:33:02 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_API.c,v 1.301 2005/08/15 14:39:18 dmitry Exp $ */
+/* $Id: zend_API.c,v 1.302 2005/08/16 14:33:02 dmitry Exp $ */
#include "zend.h"
#include "zend_execute.h"
@@ -989,7 +989,14 @@
zval member;
TSRMLS_FETCH();
- ZVAL_STRINGL(&member, hash_key->u.string, hash_key->nKeyLength-1, 0);
+ if (hash_key->type == IS_STRING) {
+ ZVAL_STRINGL(&member, hash_key->u.string, hash_key->nKeyLength-1, 0);
+ } else if (hash_key->type == IS_BINARY) {
+ ZVAL_BINARYL(&member, hash_key->u.string, hash_key->nKeyLength-1, 0);
+ } else if (hash_key->type == IS_UNICODE) {
+ ZVAL_UNICODEL(&member, hash_key->u.unicode, hash_key->nKeyLength-1, 0);
+ }
+
obj_ht->write_property(obj, &member, *value TSRMLS_CC);
}
return ZEND_HASH_APPLY_KEEP;