Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6: Fixed test 5.5.31 now
yezhaobin · Sep 30, 2015 · a60105d · a60105d
2 parents ba6d193 + 0fd71d1
commit a60105d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ext/phar/tests/bug70433.phpt b/ext/phar/tests/bug70433.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Phar - bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/"
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip"); ?>
+<?php if (!extension_loaded("phar") || !extension_loaded("zlib")) die("skip"); ?>
 --FILE--
 <?php
 $phar = new PharData(__DIR__."/bug70433.zip");