helly Mon Jul 24 17:55:42 2006 UTC
Modified files:
/php-src/ext/reflection php_reflection.c
/php-src/ext/soap php_encoding.c
/php-src/ext/standard http.c var.c
/php-src/ext/wddx wddx.c
Log:
- zend_(u_)_unmangle_property_name() has changed
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.244&r2=1.245&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.244
php-src/ext/reflection/php_reflection.c:1.245
--- php-src/ext/reflection/php_reflection.c:1.244 Tue Jul 18 17:52:45 2006
+++ php-src/ext/reflection/php_reflection.c Mon Jul 24 17:55:41 2006
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_reflection.c,v 1.244 2006/07/18 17:52:45 andrei Exp $ */
+/* $Id: php_reflection.c,v 1.245 2006/07/24 17:55:41 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -791,7 +791,7 @@
string_printf(str, "static ");
}
- zend_u_unmangle_property_name(UG(unicode)?IS_UNICODE:IS_STRING,
prop->name, &class_name, &prop_name);
+ zend_u_unmangle_property_name(UG(unicode)?IS_UNICODE:IS_STRING,
prop->name, prop->name_length, &class_name, &prop_name);
string_printf(str, "$%v", prop_name);
}
@@ -1115,7 +1115,7 @@
zstr class_name, prop_name;
zend_uchar utype = UG(unicode) ? IS_UNICODE : IS_STRING;
- zend_u_unmangle_property_name(utype, prop->name, &class_name,
&prop_name);
+ zend_u_unmangle_property_name(utype, prop->name, prop->name_length,
&class_name, &prop_name);
if (!(prop->flags & ZEND_ACC_PRIVATE)) {
/* we have to seach the class hierarchy for this (implicit)
public or protected property */
@@ -2755,7 +2755,7 @@
zend_hash_get_current_key_ex(&ce->default_properties,
&key, &key_len, &num_index, 0, &pos);
zend_hash_move_forward_ex(&ce->default_properties,
&pos);
-
zend_u_unmangle_property_name(UG(unicode)?IS_UNICODE:IS_STRING, key,
&class_name, &prop_name);
+
zend_u_unmangle_property_name(UG(unicode)?IS_UNICODE:IS_STRING, key, key_len-1,
&class_name, &prop_name);
/* FIXME: Unicode support??? */
if (class_name.s && class_name.s[0] != '*' &&
strcmp(class_name.s, ce->name.s)) {
/* filter privates from base classes */
@@ -3770,7 +3770,7 @@
ZVAL_TEXTL(classname, ce->name, ce->name_length, 1);
zend_hash_update(Z_OBJPROP_P(object), "class", sizeof("class"), (void
**) &classname, sizeof(zval *), NULL);
- zend_u_unmangle_property_name(UG(unicode)?IS_UNICODE:IS_STRING,
property_info->name, &class_name, &prop_name);
+ zend_u_unmangle_property_name(UG(unicode)?IS_UNICODE:IS_STRING,
property_info->name, property_info->name_length, &class_name, &prop_name);
MAKE_STD_ZVAL(propname);
ZVAL_TEXT(propname, prop_name, 1);
zend_hash_update(Z_OBJPROP_P(object), "name", sizeof("name"), (void **)
&propname, sizeof(zval *), NULL);
@@ -4838,7 +4838,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Reflection", "enabled");
- php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.244
2006/07/18 17:52:45 andrei Exp $");
+ php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.245
2006/07/24 17:55:41 helly Exp $");
php_info_print_table_end();
} /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.137&r2=1.138&diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.137
php-src/ext/soap/php_encoding.c:1.138
--- php-src/ext/soap/php_encoding.c:1.137 Tue Jul 18 15:05:07 2006
+++ php-src/ext/soap/php_encoding.c Mon Jul 24 17:55:41 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_encoding.c,v 1.137 2006/07/18 15:05:07 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.138 2006/07/24 17:55:41 helly Exp $ */
#include <time.h>
@@ -1844,7 +1844,7 @@
if (Z_TYPE_P(data) == IS_OBJECT) {
char *class_name;
-
zend_unmangle_property_name(key.s, &class_name, &prop_name);
+
zend_unmangle_property_name(key.s, key_len-1, &class_name, &prop_name);
} else {
prop_name = key.s;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http.c?r1=1.21&r2=1.22&diff_format=u
Index: php-src/ext/standard/http.c
diff -u php-src/ext/standard/http.c:1.21 php-src/ext/standard/http.c:1.22
--- php-src/ext/standard/http.c:1.21 Sun Jul 23 06:05:23 2006
+++ php-src/ext/standard/http.c Mon Jul 24 17:55:41 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: http.c,v 1.21 2006/07/23 06:05:23 helly Exp $ */
+/* $Id: http.c,v 1.22 2006/07/24 17:55:41 helly Exp $ */
#include "php_http.h"
#include "php_ini.h"
@@ -71,11 +71,11 @@
zstr tmp;
zend_object *zobj = zend_objects_get_address(type
TSRMLS_CC);
- if (zend_check_property_access(zobj, IS_STRING, key
TSRMLS_CC) != SUCCESS) {
+ if (zend_check_property_access(zobj, IS_STRING, key,
key_len TSRMLS_CC) != SUCCESS) {
/* private or protected property access outside
of the class */
continue;
}
- zend_u_unmangle_property_name(key_type, key, &tmp,
&key);
+ zend_u_unmangle_property_name(key_type, key, key_len,
&tmp, &key);
key_len = strlen(key.s);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var.c?r1=1.239&r2=1.240&diff_format=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.239 php-src/ext/standard/var.c:1.240
--- php-src/ext/standard/var.c:1.239 Tue Jul 18 09:08:06 2006
+++ php-src/ext/standard/var.c Mon Jul 24 17:55:41 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var.c,v 1.239 2006/07/18 09:08:06 dmitry Exp $ */
+/* $Id: var.c,v 1.240 2006/07/24 17:55:41 helly Exp $ */
@@ -149,7 +149,7 @@
} else { /* string key */
int is_unicode = hash_key->type == IS_UNICODE;
- zend_u_unmangle_property_name(hash_key->type, hash_key->arKey,
&class_name, &prop_name);
+ zend_u_unmangle_property_name(hash_key->type, hash_key->arKey,
hash_key->nKeyLength-1, &class_name, &prop_name);
php_printf("%*c[", level + 1, ' ');
if (class_name.s) {
@@ -345,7 +345,7 @@
} else { /* string key */
int is_unicode = hash_key->type == IS_UNICODE;
- zend_u_unmangle_property_name(hash_key->type, hash_key->arKey,
&class_name, &prop_name);
+ zend_u_unmangle_property_name(hash_key->type, hash_key->arKey,
hash_key->nKeyLength-1, &class_name, &prop_name);
php_printf("%*c[", level + 1, ' ');
if (class_name.s) {
@@ -506,7 +506,7 @@
if (hash_key->nKeyLength != 0) {
php_printf("%*c", level + 1, ' ');
- zend_u_unmangle_property_name(hash_key->type, hash_key->arKey,
&class_name, &prop_name);
+ zend_u_unmangle_property_name(hash_key->type, hash_key->arKey,
hash_key->nKeyLength-1, &class_name, &prop_name);
php_printf(" '%R' => ", hash_key->type, prop_name);
php_var_export(zv, level + 2 TSRMLS_CC);
PUTS (",\n");
http://cvs.php.net/viewvc.cgi/php-src/ext/wddx/wddx.c?r1=1.136&r2=1.137&diff_format=u
Index: php-src/ext/wddx/wddx.c
diff -u php-src/ext/wddx/wddx.c:1.136 php-src/ext/wddx/wddx.c:1.137
--- php-src/ext/wddx/wddx.c:1.136 Tue May 30 02:40:49 2006
+++ php-src/ext/wddx/wddx.c Mon Jul 24 17:55:41 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: wddx.c,v 1.136 2006/05/30 02:40:49 iliaa Exp $ */
+/* $Id: wddx.c,v 1.137 2006/07/24 17:55:41 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -530,7 +530,7 @@
if (zend_hash_get_current_key_ex(HASH_OF(obj), &key,
&key_len, &idx, 0, NULL) == HASH_KEY_IS_STRING) {
char *class_name, *prop_name;
- zend_unmangle_property_name(key, &class_name,
&prop_name);
+ zend_unmangle_property_name(key, key_len-1,
&class_name, &prop_name);
php_wddx_serialize_var(packet, *ent, prop_name,
strlen(prop_name)+1 TSRMLS_CC);
} else {
key_len = sprintf(tmp_buf, "%ld", idx);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
