]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' PHP-5.4
authorMatteo Beccati <mbeccati@php.net>
Sat, 29 Aug 2015 08:48:53 +0000 (10:48 +0200)
committerJulien Pauli <jpauli@php.net>
Wed, 2 Sep 2015 15:53:36 +0000 (17:53 +0200)
* PHP-5.6:
  Added missing skipif for phar+zlib test

ext/phar/tests/bug70019.phpt

index d7976a180d5dc45c9f8675e49b5f67296ffd637b..85bf1780aa4fc7a2085cd2a1baca32aa18b030e5 100644 (file)
@@ -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";