Merge branch 'PHP-7.0'

laruence · laruence · commit 0c8879e3da50 · 2016-05-17T18:07:36.000+08:00
* PHP-7.0:
  Let's only read-only here
diff --git a/ext/standard/var.c b/ext/standard/var.c
@@ -958,7 +958,7 @@ static void php_var_serialize_intern(smart_str *buf, zval *struc, php_serialize_
 					}
 
 					if (Z_ISREF_P(data) && Z_REFCOUNT_P(data) == 1) {
-						ZVAL_UNREF(data);
+						data = Z_REFVAL_P(data);
 					}
 
 					/* we should still add element even if it's not OK,

Original file line number	Diff line number	Diff line change
`@@ -958,7 +958,7 @@ static void php_var_serialize_intern(smart_str buf, zval struc, php_serialize_`
`958`	`958`	`}`
`959`	`959`
`960`	`960`	`if (Z_ISREF_P(data) && Z_REFCOUNT_P(data) == 1) {`
`961`		`- ZVAL_UNREF(data);`
	`961`	`+ data = Z_REFVAL_P(data);`
`962`	`962`	`}`
`963`	`963`
`964`	`964`	`/* we should still add element even if it's not OK,`