Merge branch 'PHP-8.3' into PHP-8.4

petk · Mar 3, 2025 · 5d0d5b6 · 5d0d5b6
2 parents 5585ad6 + d1d7bb7
commit 5d0d5b6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/patches/8.5/dmalloc.patch b/patches/8.5/dmalloc.patch
@@ -10,7 +10,7 @@ See: https://github.com/php/php-src/pull/8465
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
-index 9e8d8d1b8a..4c64d8d6ff 100644
+index b7e3e5fa1b..d1c9a3ea22 100644
 --- a/sapi/cli/php_cli_server.c
 +++ b/sapi/cli/php_cli_server.c
 @@ -15,6 +15,8 @@