com php-src: Merge branch 'PHP-5.6': ext/phar/tests/bug70019.phpt
| From: | JulienPauli | Date: | Wed, 02 Sep 2015 16:01:57 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/phar/tests/bug70019.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88871@lists.php.net to get a copy of this message | ||
Commit: 0816b88e3c1f92239aefa4e2b5c1a73656f70887
Author: Matteo Beccati <mbeccati@php.net> Sat, 29 Aug 2015 10:48:53 +0200
Committer: Julien Pauli <jpauli@php.net> Wed, 2 Sep 2015 18:01:57 +0200
Parents: 24324791c23de1d66d1ff7787b472db30d1af228
Branches: PHP-5.4.45
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0816b88e3c1f92239aefa4e2b5c1a73656f70887
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Added missing skipif for phar+zlib test
Changed paths:
M ext/phar/tests/bug70019.phpt
Diff:
diff --git a/ext/phar/tests/bug70019.phpt b/ext/phar/tests/bug70019.phpt
index d7976a1..85bf178 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";