Merge branch 'PHP-7.1'

This commit is contained in:
Nikita Popov 2017-06-03 15:09:04 +02:00
commit d162147315

View File

@ -471,10 +471,6 @@ static void php_wddx_serialize_object(wddx_packet *packet, zval *obj)
*/
if (call_user_function_ex(CG(function_table), obj, &fname, &retval, 0, 0, 1, NULL) == SUCCESS) {
if (!Z_ISUNDEF(retval) && (sleephash = HASH_OF(&retval))) {
PHP_CLASS_ATTRIBUTES;
PHP_SET_CLASS_ATTRIBUTES(obj);
php_wddx_add_chunk_static(packet, WDDX_STRUCT_S);
snprintf(tmp_buf, WDDX_BUF_LEN, WDDX_VAR_S, PHP_CLASS_NAME_VAR);
php_wddx_add_chunk(packet, tmp_buf);