diff options
| author | Julien Pauli <jpauli@php.net> | 2015-09-30 13:19:18 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-09-30 13:19:18 +0200 |
| commit | 0fd71d1184727ac31c1ab06bef140650a06e35b3 (patch) | |
| tree | e5b481f9cff5e1c1b8835f9aca2a263872dc086f | |
| parent | 07a8e5ce37140690cd179d0c3ae034bd4ae718cd (diff) | |
| parent | d7fb43e30d662c7fff999521ebf15ddbb192c7ca (diff) | |
| download | php-git-0fd71d1184727ac31c1ab06bef140650a06e35b3.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed test
5.5.31 now
Conflicts:
configure.in
main/php_version.h
| -rw-r--r-- | ext/phar/tests/bug70433.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/phar/tests/bug70433.phpt b/ext/phar/tests/bug70433.phpt index cbebb34c37..cc8f438463 100644 --- a/ext/phar/tests/bug70433.phpt +++ b/ext/phar/tests/bug70433.phpt @@ -1,7 +1,7 @@ --TEST-- Phar - bug #70433 - Uninitialized pointer in phar_make_dirstream when zip entry filename is "/" --SKIPIF-- -<?php if (!extension_loaded("phar")) die("skip"); ?> +<?php if (!extension_loaded("phar") || !extension_loaded("zlib")) die("skip"); ?> --FILE-- <?php $phar = new PharData(__DIR__."/bug70433.zip"); |