dmitry Mon, 21 Dec 2009 15:29:21 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=292416
Log:
Fixed Unicode support
Changed paths:
U php/php-src/trunk/Zend/zend_vm_def.h
U php/php-src/trunk/Zend/zend_vm_execute.h
Modified: php/php-src/trunk/Zend/zend_vm_def.h
===================================================================
--- php/php-src/trunk/Zend/zend_vm_def.h 2009-12-21 15:29:20 UTC (rev
292415)
+++ php/php-src/trunk/Zend/zend_vm_def.h 2009-12-21 15:29:21 UTC (rev
292416)
@@ -4406,8 +4406,8 @@
zend_op *opline = EX(opline);
zend_class_entry **pce, **pce_orig;
- if (zend_hash_find(EG(class_table), Z_STRVAL(opline->op2.u.constant),
Z_STRLEN(opline->op2.u.constant)+1, (void**)&pce) == FAILURE ||
- (zend_hash_find(EG(class_table), Z_STRVAL(opline->op1.u.constant),
Z_STRLEN(opline->op1.u.constant), (void**)&pce_orig) == SUCCESS &&
+ if (zend_u_hash_find(EG(class_table), Z_TYPE(opline->op2.u.constant),
Z_UNIVAL(opline->op2.u.constant), Z_UNILEN(opline->op2.u.constant)+1,
(void**)&pce) == FAILURE ||
+ (zend_u_hash_find(EG(class_table), Z_TYPE(opline->op1.u.constant),
Z_UNIVAL(opline->op1.u.constant), Z_UNILEN(opline->op1.u.constant),
(void**)&pce_orig) == SUCCESS &&
*pce != *pce_orig)) {
do_bind_inherited_class(opline, EG(class_table),
EX_T(opline->extended_value).class_entry, 0 TSRMLS_CC);
}
Modified: php/php-src/trunk/Zend/zend_vm_execute.h
===================================================================
--- php/php-src/trunk/Zend/zend_vm_execute.h 2009-12-21 15:29:20 UTC (rev
292415)
+++ php/php-src/trunk/Zend/zend_vm_execute.h 2009-12-21 15:29:21 UTC (rev
292416)
@@ -574,8 +574,8 @@
zend_op *opline = EX(opline);
zend_class_entry **pce, **pce_orig;
- if (zend_hash_find(EG(class_table), Z_STRVAL(opline->op2.u.constant),
Z_STRLEN(opline->op2.u.constant)+1, (void**)&pce) == FAILURE ||
- (zend_hash_find(EG(class_table), Z_STRVAL(opline->op1.u.constant),
Z_STRLEN(opline->op1.u.constant), (void**)&pce_orig) == SUCCESS &&
+ if (zend_u_hash_find(EG(class_table), Z_TYPE(opline->op2.u.constant),
Z_UNIVAL(opline->op2.u.constant), Z_UNILEN(opline->op2.u.constant)+1,
(void**)&pce) == FAILURE ||
+ (zend_u_hash_find(EG(class_table), Z_TYPE(opline->op1.u.constant),
Z_UNIVAL(opline->op1.u.constant), Z_UNILEN(opline->op1.u.constant),
(void**)&pce_orig) == SUCCESS &&
*pce != *pce_orig)) {
do_bind_inherited_class(opline, EG(class_table),
EX_T(opline->extended_value).class_entry, 0 TSRMLS_CC);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
