From f44f0d6447013edfaf34ae7066851f352c293bb4 Mon Sep 17 00:00:00 2001 From: Eric Mann Date: Wed, 12 Mar 2025 06:06:57 -0700 Subject: [PATCH 1/2] Update versions for php 8.3.19 --- NEWS | 2 +- Zend/zend.h | 2 +- configure.ac | 2 +- main/php_version.h | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index 07c3abca2c771..bd0c7271750f6 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -13 Mar 2025, PHP 8.3.18 +13 Mar 2025, PHP 8.3.19 - BCMath: . Fixed bug GH-17398 (bcmul memory leak). (SakiTakamachi) diff --git a/Zend/zend.h b/Zend/zend.h index b5bed8b61187c..45ccd289a9041 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -20,7 +20,7 @@ #ifndef ZEND_H #define ZEND_H -#define ZEND_VERSION "4.3.18" +#define ZEND_VERSION "4.3.19" #define ZEND_ENGINE_3 diff --git a/configure.ac b/configure.ac index d01440cb190a9..92c2e9d4f30be 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ dnl Basic autoconf initialization, generation of config.nice. dnl ---------------------------------------------------------------------------- AC_PREREQ([2.68]) -AC_INIT([PHP],[8.3.18],[https://github.com/php/php-src/issues],[php],[https://www.php.net]) +AC_INIT([PHP],[8.3.19],[https://github.com/php/php-src/issues],[php],[https://www.php.net]) AC_CONFIG_SRCDIR([main/php_version.h]) AC_CONFIG_AUX_DIR([build]) AC_PRESERVE_HELP_ORDER diff --git a/main/php_version.h b/main/php_version.h index d6d6d36f9d871..bccd4caa55e8b 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -2,7 +2,7 @@ /* edit configure.ac to change version number */ #define PHP_MAJOR_VERSION 8 #define PHP_MINOR_VERSION 3 -#define PHP_RELEASE_VERSION 18 +#define PHP_RELEASE_VERSION 19 #define PHP_EXTRA_VERSION "" -#define PHP_VERSION "8.3.18" -#define PHP_VERSION_ID 80318 +#define PHP_VERSION "8.3.19" +#define PHP_VERSION_ID 80319 From fdeadcd9ba0627cf1967220489ab6caa031e4034 Mon Sep 17 00:00:00 2001 From: Niels Dossche <7771979+nielsdos@users.noreply.github.com> Date: Thu, 27 Feb 2025 20:52:49 +0100 Subject: [PATCH 2/2] Fix branch target in zend_jit_push_call_frame() Introduced by accident in 3b4a58da44ed90adb11a98b88aea9114bbca14b1. Will request a cherry-pick. --- ext/opcache/jit/zend_jit_arm64.dasc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/opcache/jit/zend_jit_arm64.dasc b/ext/opcache/jit/zend_jit_arm64.dasc index 985c08f0512ea..bb6503c6f9dd3 100644 --- a/ext/opcache/jit/zend_jit_arm64.dasc +++ b/ext/opcache/jit/zend_jit_arm64.dasc @@ -8658,7 +8658,7 @@ static int zend_jit_push_call_frame(dasm_State **Dst, const zend_op *opline, con if (!func) { | ldrb TMP1w, [REG0, #offsetof(zend_closure, func.type)] | cmp TMP1w, #ZEND_USER_FUNCTION - | beq >1 + | bne >1 } if (!func || func->common.type == ZEND_USER_FUNCTION) { | add FCARG1x, REG0, #offsetof(zend_closure, func)