Merge branch 'PHP-5.6'

Conflicts:
	ext/spl/spl_observer.c

diff --cc ext/spl/spl_observer.c
index 76457616eadeda1e7aa9985fd8561210f26f862a,6cde449df7eae1154c0030cff3cbe569e4f19b36..41687d02a33ddc6fe3e26cf47ec56a63d5c2a43b
--- 1/ext/spl/spl_observer.c
--- 2/ext/spl/spl_observer.c
+++ b/ext/spl/spl_observer.c
@@@ -769,9 -796,12 +769,10 @@@ SPL_METHOD(SplObjectStorage, serialize
  
        /* members */
        smart_str_appendl(&buf, "m:", 2);
 -      INIT_PZVAL(&members);
 -      Z_ARRVAL(members) = zend_std_get_properties(getThis() TSRMLS_CC);
 -      Z_TYPE(members) = IS_ARRAY;
 -      zend_hash_del(Z_ARRVAL(members), "\x00gcdata", sizeof("\x00gcdata"));
 -      pmembers = &members;
 -      php_var_serialize(&buf, &pmembers, &var_hash TSRMLS_CC); /* finishes the string */
 +      ZVAL_ARR(&members, zend_array_dup(zend_std_get_properties(getThis())));
++      zend_hash_str_del(Z_ARRVAL(members), "\x00gcdata", sizeof("\x00gcdata") - 1);
 +      php_var_serialize(&buf, &members, &var_hash); /* finishes the string */
 +      zval_ptr_dtor(&members);
  
        /* done */
        PHP_VAR_SERIALIZE_DESTROY(var_hash);