Merge branch 'PHP-5.5'

Author: laruence

Zend/zend_compile.c

@@ -4221,9 +4221,8 @@ static void zend_do_traits_property_binding(zend_class_entry *ce TSRMLS_DC) /* {
 				prop_name_length = property_info->name_length;
 			} else {
 				/* for private and protected we need to unmangle the names */
-				zend_unmangle_property_name(property_info->name, property_info->name_length,
-											&class_name_unused, &prop_name);
-				prop_name_length = strlen(prop_name);
+				zend_unmangle_property_name_ex(property_info->name, property_info->name_length,
+											&class_name_unused, &prop_name, &prop_name_length);
 				prop_hash = zend_get_hash_value(prop_name, prop_name_length + 1);
 			}
 

Zend/zend_object_handlers.c

@@ -363,9 +363,10 @@ ZEND_API int zend_check_property_access(zend_object *zobj, const char *prop_info
 	zend_property_info *property_info;
 	const char *class_name, *prop_name;
 	zval member;
+	int prop_name_len;
 
-	zend_unmangle_property_name(prop_info_name, prop_info_name_len, &class_name, &prop_name);
-	ZVAL_STRING(&member, prop_name, 0);
+	zend_unmangle_property_name_ex(prop_info_name, prop_info_name_len, &class_name, &prop_name, &prop_name_len);
+	ZVAL_STRINGL(&member, prop_name, prop_name_len, 0);
 	property_info = zend_get_property_info_quick(zobj->ce, &member, 1, NULL TSRMLS_CC);
 	if (!property_info) {
 		return FAILURE;

ext/standard/http.c

@@ -69,12 +69,11 @@ PHPAPI int php_url_encode_hash_ex(HashTable *ht, smart_str *formstr,
 			const char *tmp;
 
 			zend_object *zobj = zend_objects_get_address(type TSRMLS_CC);
-			if (zend_check_property_access(zobj, key, key_len-1 TSRMLS_CC) != SUCCESS) {
+			if (zend_check_property_access(zobj, key, key_len TSRMLS_CC) != SUCCESS) {
 				/* private or protected property access outside of the class */
 				continue;
 			}
-			zend_unmangle_property_name(key, key_len-1, &tmp, (const char**)&key);
-			key_len = strlen(key);		
+			zend_unmangle_property_name_ex(key, key_len, &tmp, (const char**)&key, &key_len);
 		}
 
 		if (zend_hash_get_current_data_ex(ht, (void **)&zdata, NULL) == FAILURE || !zdata || !(*zdata)) {