summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2013-09-02 16:16:07 +0800
committerXinchen Hui <laruence@php.net>2013-09-02 16:16:07 +0800
commitb2ee1b629e6b48b43fa6d17a040a2a0ee69caddc (patch)
treea4488a9722c96997a54a4d1956210439c4c5eb6f
parentdd1cbd140b513f5d790c2d8b57f48717e6864ef1 (diff)
parent6c48c6bc789e4a2f5bf480bd2c62070ee1152e62 (diff)
downloadphp-git-b2ee1b629e6b48b43fa6d17a040a2a0ee69caddc.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
-rw-r--r--Zend/tests/bug64896.phpt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/tests/bug64896.phpt b/Zend/tests/bug64896.phpt
index e3e9f05632..3e955bbece 100644
--- a/Zend/tests/bug64896.phpt
+++ b/Zend/tests/bug64896.phpt
@@ -1,7 +1,7 @@
--TEST--
Bug #64896 (Segfault with gc_collect_cycles using unserialize on certain objects)
--XFAIL--
-We can not fix this bug with a significant (performace slow down) change to gc
+We can not fix this bug without a significant (performace slow down) change to gc
--FILE--
<?php
$bar = NULL;