summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2012-07-29 14:31:04 +0800
committerXinchen Hui <laruence@php.net>2012-07-29 14:31:04 +0800
commite0c014deadc4d858507b83fab49e95b7f06954dc (patch)
treeb35ef4ce4d2a2b7290cd5fea503f731a778a2f71
parentc6ad98975ede538d35850dbe62bac6cc4b3fd48e (diff)
parentf419d614ba79dbf2b4d7eae016a39cc9735a2cb2 (diff)
downloadphp-git-e0c014deadc4d858507b83fab49e95b7f06954dc.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
-rw-r--r--ext/standard/tests/streams/bug61115-1.phpt6
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/standard/tests/streams/bug61115-1.phpt b/ext/standard/tests/streams/bug61115-1.phpt
index 89374e7353..99e2f7929c 100644
--- a/ext/standard/tests/streams/bug61115-1.phpt
+++ b/ext/standard/tests/streams/bug61115-1.phpt
@@ -1,5 +1,11 @@
--TEST--
Bug #61115: Stream related segfault on fatal error in php_stream_context_del_link - variation 1
+--SKIPIF--
+<?php
+if (getenv("USE_ZEND_ALLOC") === "0") {
+ die("skip Zend MM disabled");
+}
+?>
--FILE--
<?php