diff options
| author | Remi Collet <remi@remirepo.net> | 2024-08-14 10:01:46 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2024-08-14 10:01:46 +0200 |
| commit | 26c0349c12696cdd0fc47ee6e877fabeae32f337 (patch) | |
| tree | 33a3edf00c511674e7cb5ee2924412907b51f141 /upstream.patch | |
| parent | 2e5230819fb65319a5744dcf372aee3deb2a31b0 (diff) | |
test build for upstream patch
open https://github.com/php/php-src/pull/15383 fix test expectation
open https://github.com/php/php-src/pull/15382 cleanup php.ini
Diffstat (limited to 'upstream.patch')
| -rw-r--r-- | upstream.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/upstream.patch b/upstream.patch new file mode 100644 index 0000000..f4c2a18 --- /dev/null +++ b/upstream.patch @@ -0,0 +1,21 @@ +From 40d88cacc1db11787aa2fde6d0ee4b6064746d94 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Tue, 13 Aug 2024 22:58:44 +0200 +Subject: [PATCH] Fix test expectation for "Built by..." (#15383) + +--- + sapi/fpm/tests/main-version.phpt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sapi/fpm/tests/main-version.phpt b/sapi/fpm/tests/main-version.phpt +index 40ea45ef01026..5ae83562d070b 100644 +--- a/sapi/fpm/tests/main-version.phpt ++++ b/sapi/fpm/tests/main-version.phpt +@@ -16,6 +16,6 @@ echo "Done\n"; + --EXPECTF-- + string(%d) "PHP %s (fpm%s (built: %s + Copyright (c) The PHP Group +-Zend Engine v%s, Copyright (c) Zend Technologies ++%AZend Engine v%s, Copyright (c) Zend Technologies + " + Done |