summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Beccati <mbeccati@php.net>2015-08-29 10:48:53 +0200
committerJulien Pauli <jpauli@php.net>2015-09-02 18:01:57 +0200
commit0816b88e3c1f92239aefa4e2b5c1a73656f70887 (patch)
treeebe855f0295ab6503bb1aab0e4847eff1c670a50
parent24324791c23de1d66d1ff7787b472db30d1af228 (diff)
downloadphp-git-PHP-5.4.45.tar.gz
Merge branch 'PHP-5.6'PHP-5.4.45
* PHP-5.6: Added missing skipif for phar+zlib test
-rw-r--r--ext/phar/tests/bug70019.phpt2
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/phar/tests/bug70019.phpt b/ext/phar/tests/bug70019.phpt
index d7976a180d..85bf1780aa 100644
--- a/ext/phar/tests/bug70019.phpt
+++ b/ext/phar/tests/bug70019.phpt
@@ -1,5 +1,7 @@
--TEST--
Bug #70019 Files extracted from archive may be placed outside of destination directory
+--SKIPIF--
+<?php if (!extension_loaded("phar") || !extension_loaded('zlib')) die("skip"); ?>
--FILE--
<?php
$dir = __DIR__."/bug70019";