com php-src: Merge branch 'PHP-5.6': ext/phar/tests/bug70019.phpt

From: Date: Wed, 02 Sep 2015 23:53:40 +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-88876@lists.php.net to get a copy of this message
Commit: bb151b0a755ffc2623f029666b18384bb0b336bb Author: Matteo Beccati <mbeccati@php.net> Sat, 29 Aug 2015 10:48:53 +0200 Committer: Ferenc Kovacs <tyrael@php.net> Thu, 3 Sep 2015 01:53:40 +0200 Parents: a4c64d152cee3f71fd931b18ef4b8a540337ee72 Branches: PHP-5.6.13 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bb151b0a755ffc2623f029666b18384bb0b336bb 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";

« previous php.cvs (#88876) next »