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

From: Date: Wed, 02 Sep 2015 16:00:35 +0000
Subject: com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/phar/tests/bug70019.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-88870@lists.php.net to get a copy of this message
Commit: 46370d548b7803ca38901fe5839e18a3ab93aab5 Author: Julien Pauli <jpauli@php.net> Wed, 2 Sep 2015 17:55:20 +0200 Parents: 58b8d9d27eb2bcdf5de2197bbd80949c05ecb88d Branches: PHP-5.5.29 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=46370d548b7803ca38901fe5839e18a3ab93aab5 Log: 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 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 (#88870) next »