diff options
| author | Stanislav Malyshev <stas@php.net> | 2018-12-02 15:12:15 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2018-12-02 15:12:15 -0800 |
| commit | 1225467d8a02d91bc6791735d4e3148b06ed2d6a (patch) | |
| tree | 37585cc8143486b9d4ba9590cda34f64425284d4 | |
| parent | 655fb96354f5ee9c08b8104b0ad7018316feb5bc (diff) | |
| parent | f8eac1f438d043440f3da18262ce7fb0986feb50 (diff) | |
| download | php-git-1225467d8a02d91bc6791735d4e3148b06ed2d6a.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix TSRM signature - php_stream_stat macro has it's own TSRM
Regenerate certificates for openssl tests
Improve test for bug77022
| -rw-r--r-- | ext/phar/tests/bug77022.phpt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/phar/tests/bug77022.phpt b/ext/phar/tests/bug77022.phpt index 66bcf66dd4..c78d1bdafd 100644 --- a/ext/phar/tests/bug77022.phpt +++ b/ext/phar/tests/bug77022.phpt @@ -1,7 +1,10 @@ --TEST-- Phar: Bug #77022: PharData always creates new files with mode 0666 --SKIPIF-- -<?php if (!extension_loaded("phar")) die("skip"); ?> +<?php +if (!extension_loaded("phar")) die("skip"); +if (defined("PHP_WINDOWS_VERSION_MAJOR")) die("skip not for Windows") +?> --FILE-- <?php umask(022); @@ -11,6 +14,7 @@ $sFile = tempnam(__DIR__, 'test77022'); var_dump(decoct(stat($sFile)['mode'])); foreach([Phar::TAR => 'tar', Phar::ZIP => 'zip'] as $mode => $ext) { + clearstatcache(); $phar = new PharData(__DIR__ . '/test77022.' . $ext, null, null, $mode); $phar->addFile($sFile, 'test-file-phar'); $phar->addFromString("test-from-string", 'test-file-phar'); |