summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2013-09-02 16:16:15 +0800
committerXinchen Hui <laruence@php.net>2013-09-02 16:16:15 +0800
commit825c1f239b3432e76299c1dba0869df2b57b4c0d (patch)
tree71cb86562008a76490a128a1bd6a01b4643bc6bb
parentf33bdf68b174c4a1283005a9049fcfacd9fc4519 (diff)
parentb2ee1b629e6b48b43fa6d17a040a2a0ee69caddc (diff)
downloadphp-git-825c1f239b3432e76299c1dba0869df2b57b4c0d.tar.gz
Merge branch '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;