Merge tag 'php-8.2.21' into was-8.2.x

Tag for php-8.2.21

Author: MaxKellermann

.github/CODEOWNERS

@@ -38,25 +38,24 @@
 /ext/xsl @nielsdos
 /main @bukka
 /sapi/fpm @bukka
-/Zend @iluuu1994
-/Zend/Optimizer @dstogov
+/Zend/Optimizer @dstogov @iluuu1994
 /Zend/zend.* @dstogov
 /Zend/zend_alloc.* @dstogov
-/Zend/zend_API.* @dstogov
+/Zend/zend_API.* @dstogov @iluuu1994
 /Zend/zend_call_stack.* @arnaud-lb
 /Zend/zend_closures.* @dstogov
-/Zend/zend_execute.* @dstogov
-/Zend/zend_execute_API.c @dstogov
+/Zend/zend_execute.* @dstogov @iluuu1994
+/Zend/zend_execute_API.c @dstogov @iluuu1994
 /Zend/zend_gc.* @dstogov @arnaud-lb
 /Zend/zend_hash.* @dstogov
-/Zend/zend_inheritance.* @dstogov
+/Zend/zend_inheritance.* @dstogov @iluuu1994
 /Zend/zend_max_execution_timer.* @arnaud-lb
-/Zend/zend_object_handlers.* @dstogov
-/Zend/zend_objects.* @dstogov
-/Zend/zend_objects_API.* @dstogov
-/Zend/zend_opcode.* @dstogov
+/Zend/zend_object_handlers.* @dstogov @iluuu1994
+/Zend/zend_objects.* @dstogov @iluuu1994
+/Zend/zend_objects_API.* @dstogov @iluuu1994
+/Zend/zend_opcode.* @dstogov @iluuu1994
 /Zend/zend_string.* @dstogov
-/Zend/zend_type*.h @dstogov
+/Zend/zend_type*.h @dstogov @iluuu1994
 /Zend/zend_variables.* @dstogov
-/Zend/zend_vm* @dstogov
+/Zend/zend_vm* @dstogov @iluuu1994
 *.stub.php @kocsismate

.github/actions/test-linux/action.yml

@@ -1,8 +1,5 @@
 name: Test
 inputs:
-  testArtifacts:
-    default: null
-    required: false
   runTestsParameters:
     default: ''
     required: false
@@ -35,7 +32,6 @@ runs:
         export PDO_OCI_TEST_PASS="pass"
         export PDO_OCI_TEST_DSN="oci:dbname=localhost/XEPDB1;charset=AL32UTF8"
         export SKIP_IO_CAPTURE_TESTS=1
-        export TEST_PHP_JUNIT=junit.out.xml
         sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
           -d opcache.jit=${{ inputs.jitType }} \
           -d opcache.jit_buffer_size=16M \
@@ -46,9 +42,3 @@ runs:
           --show-diff \
           --show-slow 1000 \
           --set-timeout 120
-    - uses: actions/upload-artifact@v4
-      if: always() && inputs.testArtifacts != null
-      with:
-        name: ${{ github.job }}_${{ inputs.testArtifacts }}
-        path: ${{ github.workspace }}/junit.out.xml
-        retention-days: 5

.github/actions/test-macos/action.yml

@@ -1,8 +1,5 @@
 name: Test
 inputs:
-  testArtifacts:
-    default: null
-    required: false
   runTestsParameters:
     default: ''
     required: false
@@ -17,7 +14,6 @@ runs:
         set -x
         export SKIP_IO_CAPTURE_TESTS=1
         export CI_NO_IPV6=1
-        export TEST_PHP_JUNIT=junit.out.xml
         sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
           -d opcache.jit=${{ inputs.jitType }} \
           -d opcache.jit_buffer_size=16M \
@@ -28,9 +24,3 @@ runs:
           --show-diff \
           --show-slow 1000 \
           --set-timeout 120
-    - uses: actions/upload-artifact@v4
-      if: always() && inputs.testArtifacts != null
-      with:
-        name: ${{ github.job }}_${{ inputs.testArtifacts }}
-        path: ${{ github.workspace }}/junit.out.xml
-        retention-days: 5

.github/scripts/windows/test_task.bat

@@ -133,8 +133,6 @@ set TEST_PHPDBG_EXECUTABLE=%PHP_BUILD_DIR%\phpdbg.exe
 
 mkdir c:\tests_tmp
 
-set TEST_PHP_JUNIT=c:\junit.out.xml
-
 nmake test TESTS="%OPCACHE_OPTS% -g FAIL,BORK,LEAK,XLEAK --no-progress -q --offline --show-diff --show-slow 1000 --set-timeout 120 --temp-source c:\tests_tmp --temp-target c:\tests_tmp --bless %PARALLEL%"
 
 set EXIT_CODE=%errorlevel%

.github/workflows/nightly.yml

@@ -79,14 +79,12 @@ jobs:
       - name: Test
         uses: ./.github/actions/test-linux
         with:
-          testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
           runTestsParameters: >-
             ${{ matrix.run_tests_parameters }}
           idleCpu: ${{ matrix.asan && 'true' || 'false' }}
       - name: Test Tracing JIT
         uses: ./.github/actions/test-linux
         with:
-          testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
           jitType: tracing
           runTestsParameters: >-
             ${{ matrix.run_tests_parameters }}
@@ -95,7 +93,6 @@ jobs:
       - name: Test OpCache
         uses: ./.github/actions/test-linux
         with:
-          testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} OpCache
           runTestsParameters: >-
             ${{ matrix.run_tests_parameters }}
             -d zend_extension=opcache.so
@@ -106,7 +103,6 @@ jobs:
         if: matrix.test_function_jit
         uses: ./.github/actions/test-linux
         with:
-          testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Function JIT
           jitType: function
           runTestsParameters: >-
             ${{ matrix.run_tests_parameters }}
@@ -226,12 +222,9 @@ jobs:
         run: sudo make install
       - name: Test
         uses: ./.github/actions/test-macos
-        with:
-          testArtifacts: ${{ matrix.branch.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
       - name: Test Tracing JIT
         uses: ./.github/actions/test-macos
         with:
-          testArtifacts: ${{ matrix.branch.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
           jitType: tracing
           runTestsParameters: >-
             -d zend_extension=opcache.so
@@ -240,15 +233,13 @@ jobs:
       - name: Test OpCache
         uses: ./.github/actions/test-macos
         with:
-          testArtifacts: ${{ matrix.branch.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} OpCache
           runTestsParameters: >-
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
             -d opcache.protect_memory=1
       - name: Test Function JIT
         uses: ./.github/actions/test-macos
         with:
-          testArtifacts: ${{ matrix.branch.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Function JIT
           jitType: function
           runTestsParameters: >-
             -d zend_extension=opcache.so

.github/workflows/push.yml

@@ -87,18 +87,59 @@ jobs:
         uses: ./.github/actions/setup-x64
       - name: Test
         uses: ./.github/actions/test-linux
-        with:
-          testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
       - name: Test Tracing JIT
         uses: ./.github/actions/test-linux
         with:
-          testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
           jitType: tracing
           runTestsParameters: >-
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
+  LINUX_X32:
+    name: LINUX_X32_DEBUG_ZTS
+    runs-on: ubuntu-latest
+    container:
+      image: ubuntu:20.04
+    env:
+      MYSQL_TEST_HOST: mysql
+      PDO_MYSQL_TEST_DSN: mysql:host=mysql;dbname=test
+      PDO_MYSQL_TEST_HOST: mysql
+    services:
+      mysql:
+        image: mysql:8.3
+        ports:
+          - 3306:3306
+        env:
+          MYSQL_DATABASE: test
+          MYSQL_ROOT_PASSWORD: root
+    steps:
+      - name: git checkout
+        uses: actions/checkout@v3
+      - name: apt
+        uses: ./.github/actions/apt-x32
+      - name: ccache
+        uses: hendrikmuhs/[email protected]
+        with:
+          key: "${{github.job}}-${{hashFiles('main/php_version.h')}}"
+          append-timestamp: false
+      - name: ./configure
+        uses: ./.github/actions/configure-x32
+        with:
+          configurationParameters: >-
+            --enable-debug
+            --enable-zts
+      - name: make
+        run: make -j$(/usr/bin/nproc) >/dev/null
+      - name: make install
+        uses: ./.github/actions/install-linux-x32
+      - name: Test Tracing JIT
+        uses: ./.github/actions/test-linux
+        with:
+          jitType: tracing
+          runTestsParameters: >-
+            -d zend_extension=opcache.so
+            -d opcache.enable_cli=1
   MACOS_DEBUG_NTS:
     if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
     runs-on: macos-12
@@ -126,7 +167,6 @@ jobs:
       - name: Test Tracing JIT
         uses: ./.github/actions/test-macos
         with:
-          testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
           jitType: tracing
           runTestsParameters: >-
             -d zend_extension=opcache.so

NEWS

@@ -1,5 +1,81 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+04 Jul 2024, PHP 8.2.21
+
+- Core:
+  . Fixed bug GH-14315 (Incompatible pointer type warnings). (Peter Kokot)
+  . Fixed bug GH-12814 (max_execution_time reached too early on MacOS 14
+    when running on Apple Silicon). (Manuel Kress)
+  . Fixed bug GH-14387 (Crash when stack walking in destructor of yielded from
+    values during Generator->throw()). (Bob)
+  . Fixed bug GH-14456 (Attempting to initialize class with private constructor
+    calls destructor). (Girgias)
+  . Fixed bug GH-14549 (Incompatible function pointer type for fclose).
+    (Ryan Carsten Schmidt)
+
+- BCMatch:
+  . Fixed bug (bcpowmod() with mod = -1 returns 1 when it must be 0). (Girgias)
+
+- Curl:
+  . Fixed bug GH-14307 (Test curl_basic_024 fails with curl 8.8.0). (nielsdos)
+
+- DOM:
+  . Fixed bug GH-14343 (Memory leak in xml and dom). (nielsdos)
+
+- FPM:
+  . Fixed bug GH-14037 (PHP-FPM ping.path and ping.response config vars are
+    ignored in status pool). (Wilhansen Li, Pierrick Charron)
+
+- GD:
+  . Fix parameter numbers for imagecolorset(). (Giovanni Giacobbi)
+
+- Intl:
+  . Fix reference handling in SpoofChecker. (nielsdos)
+
+- MySQLnd:
+  . Partially fix bug GH-10599 (Apache crash on Windows when using a
+    self-referencing anonymous function inside a class with an active
+    mysqli connection). (nielsdos)
+
+- Opcache:
+  . Fixed bug GH-14267 (opcache.jit=off does not allow enabling JIT at runtime).
+    (ilutov)
+  . Fixed TLS access in JIT on FreeBSD/amd64. (Arnaud)
+  . Fixed bug GH-11188 (Error when building TSRM in ARM64). (nielsdos)
+
+- PDO ODBC:
+  . Fixed bug GH-14367 (incompatible SDWORD type with iODBC). (Calvin Buckley)
+
+- PHPDBG:
+  . Fixed bug GH-13681 (segfault on watchpoint addition failure). (David Carlier)
+
+- Soap:
+  . Fixed bug #47925 (PHPClient can't decompress response). (nielsdos)
+  . Fix missing error restore code. (nielsdos)
+  . Fix memory leak if calling SoapServer::setObject() twice. (nielsdos)
+  . Fix memory leak if calling SoapServer::setClass() twice. (nielsdos)
+  . Fix reading zlib ini settings in ext-soap. (nielsdos)
+  . Fix memory leaks with string function name lookups. (nielsdos)
+  . Fixed bug #69280 (SoapClient classmap doesn't support fully qualified class
+    name). (nielsdos)
+  . Fixed bug #76232 (SoapClient Cookie Header Semicolon). (nielsdos)
+  . Fixed memory leaks when calling SoapFault::__construct() twice. (Girgias)
+
+- Sodium:
+  . Fix memory leaks in ext/sodium on failure of some functions. (nielsdos)
+
+- SPL:
+  . Fixed bug GH-14290 (Member access within null pointer in extension spl).
+    (nielsdos)
+
+- Standard:
+  . Fixed bug GH-14483 (Fixed off-by-one error in checking length of abstract
+    namespace Unix sockets). (Derick)
+
+- Streams:
+  . Fixed bug GH-11078 (PHP Fatal error triggers pointer being freed was not
+    allocated and malloc: double free for ptr errors). (nielsdos)
+
 06 Jun 2024, PHP 8.2.20
 
 - CGI:

TSRM/TSRM.c

@@ -777,11 +777,20 @@ TSRM_API size_t tsrm_get_ls_cache_tcb_offset(void)
 	asm("adrp %0, #__tsrm_ls_cache@TLVPPAGE\n\t"
 	    "ldr %0, [%0, #__tsrm_ls_cache@TLVPPAGEOFF]"
 	     : "=r" (ret));
-# else
+# elif defined(TSRM_TLS_MODEL_DEFAULT)
+	/* Surplus Static TLS space isn't guaranteed. */
+	ret = 0;
+# elif defined(TSRM_TLS_MODEL_INITIAL_EXEC)
+	asm("adrp %0, :gottprel:_tsrm_ls_cache\n\t"
+		"ldr %0, [%0, #:gottprel_lo12:_tsrm_ls_cache]"
+		: "=r" (ret));
+# elif defined(TSRM_TLS_MODEL_LOCAL_EXEC)
 	asm("mov %0, xzr\n\t"
 	    "add %0, %0, #:tprel_hi12:_tsrm_ls_cache, lsl #12\n\t"
 	    "add %0, %0, #:tprel_lo12_nc:_tsrm_ls_cache"
 	     : "=r" (ret));
+# else
+#  error "TSRM TLS model not set"
 # endif
 	return ret;
 #else

TSRM/TSRM.h

@@ -150,10 +150,13 @@ TSRM_API const char *tsrm_api_name(void);
 
 #if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__MUSL__) || defined(__HAIKU__)
 # define TSRM_TLS_MODEL_ATTR
+# define TSRM_TLS_MODEL_DEFAULT
 #elif __PIC__
 # define TSRM_TLS_MODEL_ATTR __attribute__((tls_model("initial-exec")))
+# define TSRM_TLS_MODEL_INITIAL_EXEC
 #else
 # define TSRM_TLS_MODEL_ATTR __attribute__((tls_model("local-exec")))
+# define TSRM_TLS_MODEL_LOCAL_EXEC
 #endif
 
 #define TSRM_SHUFFLE_RSRC_ID(rsrc_id)		((rsrc_id)+1)

Zend/tests/generators/gh14387.phpt

@@ -0,0 +1,35 @@
+--TEST--
+GH-14387 (Crash when stack walking in destructor of yielded from values during Generator->throw())
+--FILE--
+<?php
+
+function prime(Generator $generator) {
+	$generator->valid();
+}
+
+$g = (function () {
+	yield from [null, new class {
+		function __destruct() {
+			// Trigger a stack walk, hitting a bad frame.
+			throw new Exception;
+		}
+	}];
+})();
+
+prime($g);
+
+$g->throw(new Error);
+
+?>
+--EXPECTF--
+Fatal error: Uncaught Error in %s:%d
+Stack trace:
+#0 {main}
+
+Next Exception in %s:%d
+Stack trace:
+#0 %s(%d): class@anonymous->__destruct()
+#1 [internal function]: {%s}()
+#2 %s(%d): Generator->throw(Object(Error))
+#3 {main}
+  thrown in %s on line %d