diff options
author | Matteo Beccati <mbeccati@php.net> | 2015-08-29 10:48:53 +0200 |
---|---|---|
committer | Julien Pauli <jpauli@php.net> | 2015-09-02 17:53:36 +0200 |
commit | a12cef979db2466dd98d46cffd0a32c6eb2957c3 (patch) | |
tree | bc70346a5fa0f190b14bfb64435ca5c6d38289e9 | |
parent | 51fca4b77d05cde26cfa59f54bf79fd97973c79a (diff) | |
download | php-git-PHP-5.4.tar.gz |
Merge branch 'PHP-5.6'PHP-5.4
* PHP-5.6:
Added missing skipif for phar+zlib test
-rw-r--r-- | ext/phar/tests/bug70019.phpt | 2 |
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"; |