diff options
| author | Julien Pauli <jpauli@php.net> | 2015-09-02 17:55:20 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-09-02 18:00:35 +0200 |
| commit | 46370d548b7803ca38901fe5839e18a3ab93aab5 (patch) | |
| tree | ceb6b127438df0b8810b8d8a2cbfaad633fdbb7d | |
| parent | 58b8d9d27eb2bcdf5de2197bbd80949c05ecb88d (diff) | |
| download | php-git-PHP-5.5.29.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5php-5.5.29PHP-5.5.29
* PHP-5.4:
Merge branch 'PHP-5.6'
bump version
Conflicts:
configure.in
main/php_version.h
| -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"; |