Merge branch 'master' of git.php.net:php-src

laruence · laruence · commit bb4454b5133a · 2015-06-19T09:57:48.000+08:00
diff --git a/ext/spl/spl_heap.c b/ext/spl/spl_heap.c
@@ -694,10 +694,6 @@ SPL_METHOD(SplPriorityQueue, extract)
 		return;
 	}
 
-	if (Z_REFCOUNTED_P(value_out)) {
-		Z_ADDREF_P(value_out);
-	}
-
 	RETVAL_ZVAL(value_out, 1, 0);
 	zval_ptr_dtor(&value);
 }

Original file line number	Diff line number	Diff line change
`@@ -694,10 +694,6 @@ SPL_METHOD(SplPriorityQueue, extract)`
`694`	`694`	`return;`
`695`	`695`	`}`
`696`	`696`
`697`		`- if (Z_REFCOUNTED_P(value_out)) {`
`698`		`- Z_ADDREF_P(value_out);`
`699`		`- }`
`700`		`-`
`701`	`697`	`RETVAL_ZVAL(value_out, 1, 0);`
`702`	`698`	`zval_ptr_dtor(&value);`
`703`	`699`	`}`