diff options
author | Julien Pauli <jpauli@php.net> | 2015-09-02 17:55:20 +0200 |
---|---|---|
committer | Julien Pauli <jpauli@php.net> | 2015-09-02 17:55:20 +0200 |
commit | bb98ed600ab6787d9d367927d49439be9a83441e (patch) | |
tree | e9dc9908060cbf9772b9499a2a58e2ae44bc4e63 | |
parent | ea807f9c07e841ff1a3fbfbada1423d66731ad7b (diff) | |
parent | a12cef979db2466dd98d46cffd0a32c6eb2957c3 (diff) | |
download | php-git-bb98ed600ab6787d9d367927d49439be9a83441e.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* 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"; |