diff --git a/.github/workflows/nightly-results.yml b/.github/workflows/nightly-results.yml index c1c4da72ca56a..a222582da1c6f 100644 --- a/.github/workflows/nightly-results.yml +++ b/.github/workflows/nightly-results.yml @@ -13,4 +13,4 @@ jobs: - run: | export DEBIAN_FRONTEND=noninteractive sudo apt-get install -y curl - curl -X POST -H 'Content-type: application/json' --data '{"attachments": [{"text": "Job in *nightly* failed", "footer": "<${{ github.event.workflow_run.jobs_url }}|View Run>", "color": "danger", "mrkdwn_in": ["text"]}]}' ${{ secrets.ACTION_MONITORING_SLACK }} + curl -X POST -H 'Content-type: application/json' --data '{"attachments": [{"text": "Job(s) in *nightly* failed", "footer": "<${{ github.event.workflow_run.html_url }}|View Run>", "color": "danger", "mrkdwn_in": ["text"]}]}' ${{ secrets.ACTION_MONITORING_SLACK }} diff --git a/ext/phar/phar.c b/ext/phar/phar.c index 8a41ae99199fd..15cdddb21af4f 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -1647,6 +1647,12 @@ static zend_result phar_open_from_fp(php_stream* fp, char *fname, size_t fname_l if (!PHAR_G(has_zlib)) { MAPPHAR_ALLOC_FAIL("unable to decompress gzipped phar archive \"%s\" to temporary file, enable zlib extension in php.ini") } + + /* entire file is gzip-compressed, uncompress to temporary file */ + if (!(temp = php_stream_fopen_tmpfile())) { + MAPPHAR_ALLOC_FAIL("unable to create temporary file for decompression of gzipped phar archive \"%s\"") + } + array_init(&filterparams); /* this is defined in zlib's zconf.h */ #ifndef MAX_WBITS @@ -1654,11 +1660,6 @@ static zend_result phar_open_from_fp(php_stream* fp, char *fname, size_t fname_l #endif add_assoc_long_ex(&filterparams, "window", sizeof("window") - 1, MAX_WBITS + 32); - /* entire file is gzip-compressed, uncompress to temporary file */ - if (!(temp = php_stream_fopen_tmpfile())) { - MAPPHAR_ALLOC_FAIL("unable to create temporary file for decompression of gzipped phar archive \"%s\"") - } - php_stream_rewind(fp); filter = php_stream_filter_create("zlib.inflate", &filterparams, php_stream_is_persistent(fp)); diff --git a/ext/phar/zip.c b/ext/phar/zip.c index 5abbc49d3c2ce..e38708e1337da 100644 --- a/ext/phar/zip.c +++ b/ext/phar/zip.c @@ -1259,6 +1259,7 @@ ZEND_ATTRIBUTE_NONNULL_ARGS(1, 4) void phar_zip_flush(phar_archive_data *phar, z return; } if (phar->alias_len != php_stream_write(entry.fp, phar->alias, phar->alias_len)) { + php_stream_close(entry.fp); spprintf(error, 0, "unable to set alias in zip-based phar \"%s\"", phar->fname); return; } diff --git a/run-tests.php b/run-tests.php index ac5fc91118e49..d0befa3738df1 100755 --- a/run-tests.php +++ b/run-tests.php @@ -2811,6 +2811,11 @@ function is_flaky(TestFile $test): bool if ($test->hasSection('FLAKY')) { return true; } + if ($test->hasSection('SKIPIF')) { + if (strpos($test->getSection('SKIPIF'), 'SKIP_PERF_SENSITIVE') !== false) { + return true; + } + } if (!$test->hasSection('FILE')) { return false; }