Merge branch 'PHP-5.3' into PHP-5.4

laruence · laruence · commit e0c014deadc4 · 2012-07-29T14:31:04.000+08:00
diff --git 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
 
