Merge tag 'php-8.1.23' into was-8.1.x

Tag for php-8.1.23

Author: MaxKellermann

.cirrus.yml

@@ -4,7 +4,7 @@ env:
 freebsd_task:
   name: FREEBSD_DEBUG_NTS
   freebsd_instance:
-    image_family: freebsd-13-0
+    image_family: freebsd-13-2
   env:
     ARCH: amd64
   install_script:

.github/actions/setup-windows/action.yml

@@ -0,0 +1,18 @@
+name: Setup
+runs:
+  using: composite
+  steps:
+    - name: Setup MySQL
+      shell: pwsh
+      run: |
+        choco install mysql -y --no-progress --params="/port:3306"
+        mysql.exe --port=3306 --user=root --password="" -e "ALTER USER 'root'@'localhost' IDENTIFIED BY 'Password12!'; FLUSH PRIVILEGES;"
+    - name: Setup MSSQL
+      shell: pwsh
+      run: |
+        choco install sql-server-express -y --no-progress --install-arguments="/SECURITYMODE=SQL /SAPWD=Password12!"
+    - name: Setup PostgreSQL
+      shell: pwsh
+      run: |
+        Set-Service -Name "postgresql-x64-14" -StartupType manual -Status Running
+        pwsh -Command { $env:PGPASSWORD="root"; & "$env:PGBIN\psql" -U postgres -c "ALTER USER postgres WITH PASSWORD 'Password12!';" }

.github/nightly_matrix.php

@@ -78,6 +78,25 @@ function get_matrix_include(array $branches) {
     return $jobs;
 }
 
+function get_windows_matrix_include(array $branches) {
+    $jobs = [];
+    foreach ($branches as $branch) {
+        $jobs[] = [
+            'branch' => $branch,
+            'x64' => true,
+            'zts' => true,
+            'opcache' => true,
+        ];
+        $jobs[] = [
+            'branch' => $branch,
+            'x64' => false,
+            'zts' => false,
+            'opcache' => false,
+        ];
+    }
+    return $jobs;
+}
+
 $trigger = $argv[1] ?? 'schedule';
 $attempt = (int) ($argv[2] ?? 1);
 $discard_cache = ($trigger === 'schedule' && $attempt !== 1) || $trigger === 'workflow_dispatch';
@@ -87,6 +106,8 @@ function get_matrix_include(array $branches) {
 
 $branches = get_branches();
 $matrix_include = get_matrix_include($branches);
+$windows_matrix_include = get_windows_matrix_include($branches);
 
 echo '::set-output name=branches::' . json_encode($branches, JSON_UNESCAPED_SLASHES) . "\n";
 echo '::set-output name=matrix-include::' . json_encode($matrix_include, JSON_UNESCAPED_SLASHES) . "\n";
+echo '::set-output name=windows-matrix-include::' . json_encode($windows_matrix_include, JSON_UNESCAPED_SLASHES) . "\n";

.github/workflows/nightly.yml

@@ -11,6 +11,7 @@ jobs:
     outputs:
       branches: ${{ steps.set-matrix.outputs.branches }}
       matrix-include: ${{ steps.set-matrix.outputs.matrix-include }}
+      windows-matrix-include: ${{ steps.set-matrix.outputs.windows-matrix-include }}
     steps:
       - uses: actions/checkout@v3
         with:
@@ -645,3 +646,36 @@ jobs:
         uses: ./.github/actions/notify-slack
         with:
           token: ${{ secrets.ACTION_MONITORING_SLACK }}
+  WINDOWS:
+    needs: GENERATE_MATRIX
+    if: ${{ needs.GENERATE_MATRIX.outputs.branches != '[]' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include: ${{ fromJson(needs.GENERATE_MATRIX.outputs.windows-matrix-include) }}
+    name: "${{ matrix.branch.name }}_WINDOWS_${{ matrix.x64 && 'X64' || 'X86' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
+    runs-on: windows-2019
+    env:
+      PHP_BUILD_CACHE_BASE_DIR: C:\build-cache
+      PHP_BUILD_OBJ_DIR: C:\obj
+      PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk
+      PHP_BUILD_SDK_BRANCH: php-sdk-2.2.0
+      PHP_BUILD_CRT: vs16
+      PLATFORM: ${{ matrix.x64 && 'x64' || 'x86' }}
+      THREAD_SAFE: "${{ matrix.zts && '1' || '0' }}"
+      INTRINSICS: "${{ matrix.zts && 'AVX2' || '' }}"
+      PARALLEL: -j2
+      OPCACHE: "${{ matrix.opcache && '1' || '0' }}"
+    steps:
+      - name: git config
+        run: git config --global core.autocrlf false && git config --global core.eol lf
+      - name: git checkout
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ matrix.branch.ref }}
+      - name: Setup
+        uses: ./.github/actions/setup-windows
+      - name: Build
+        run: .github/scripts/windows/build.bat
+      - name: Test
+        run: .github/scripts/windows/test.bat

.github/workflows/push.yml

@@ -77,52 +77,6 @@ jobs:
             -d opcache.jit_buffer_size=16M
       - 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
-        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
-        uses: ./.github/actions/test-linux
-      - name: Test Tracing JIT
-        uses: ./.github/actions/test-linux
-        with:
-          runTestsParameters: >-
-            -d zend_extension=opcache.so
-            -d opcache.enable_cli=1
-            -d opcache.jit_buffer_size=16M
   MACOS_DEBUG_NTS:
     runs-on: macos-11
     steps:
@@ -145,8 +99,6 @@ jobs:
           make -j$(sysctl -n hw.logicalcpu) >/dev/null
       - name: make install
         run: sudo make install
-      - name: Test
-        uses: ./.github/actions/test-macos
       - name: Test Tracing JIT
         uses: ./.github/actions/test-macos
         with:
@@ -158,45 +110,26 @@ jobs:
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
   WINDOWS:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - x64: true
-            zts: false
-            opcache: true
-          - x64: false
-            zts: true
-            opcache: false
-    name: "WINDOWS_${{ matrix.x64 && 'X64' || 'X86' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
+    name: WINDOWS_X64_ZTS
     runs-on: windows-2019
     env:
       PHP_BUILD_CACHE_BASE_DIR: C:\build-cache
       PHP_BUILD_OBJ_DIR: C:\obj
       PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk
       PHP_BUILD_SDK_BRANCH: php-sdk-2.2.0
       PHP_BUILD_CRT: vs16
-      PLATFORM: ${{ matrix.x64 && 'x64' || 'x86' }}
-      THREAD_SAFE: "${{ matrix.zts && '1' || '0' }}"
-      INTRINSICS: "${{ matrix.zts && 'AVX2' || '' }}"
+      PLATFORM: x64
+      THREAD_SAFE: "1"
+      INTRINSICS: AVX2
       PARALLEL: -j2
-      OPCACHE: "${{ matrix.opcache && '1' || '0' }}"
+      OPCACHE: "1"
     steps:
       - name: git config
         run: git config --global core.autocrlf false && git config --global core.eol lf
       - name: git checkout
         uses: actions/checkout@v3
-      - name: Setup MySQL
-        run: |
-          choco install mysql -y --no-progress --params="/port:3306"
-          mysql.exe --port=3306 --user=root --password="" -e "ALTER USER 'root'@'localhost' IDENTIFIED BY 'Password12!'; FLUSH PRIVILEGES;"
-      - name: Setup MSSQL
-        run: |
-          choco install sql-server-express -y --no-progress --install-arguments="/SECURITYMODE=SQL /SAPWD=Password12!"
-      - name: Setup PostgreSQL
-        run: |
-          Set-Service -Name "postgresql-x64-14" -StartupType manual -Status Running
-          pwsh -Command { $env:PGPASSWORD="root"; & "$env:PGBIN\psql" -U postgres -c "ALTER USER postgres WITH PASSWORD 'Password12!';" }
+      - name: Setup
+        uses: ./.github/actions/setup-windows
       - name: Build
         run: .github/scripts/windows/build.bat
       - name: Test

NEWS

@@ -1,5 +1,69 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+31 Aug 2023, PHP 8.1.23
+
+- CLI:
+  . Fixed bug GH-11716 (cli server crashes on SIGINT when compiled with
+    ZEND_RC_DEBUG=1). (nielsdos)
+  . Fixed bug GH-10964 (Improve man page about the built-in server).
+    (Alexandre Daubois)
+
+- Core:
+  . Fixed strerror_r detection at configuration time. (Kévin Dunglas)
+
+- Date:
+  . Fixed bug GH-11416: Crash with DatePeriod when uninitialised objects
+    are passed in. (Derick)
+
+- DOM:
+  . Fix DOMEntity field getter bugs. (nielsdos)
+  . Fix incorrect attribute existence check in DOMElement::setAttributeNodeNS.
+    (nielsdos)
+  . Fix DOMCharacterData::replaceWith() with itself. (nielsdos)
+  . Fix empty argument cases for DOMParentNode methods. (nielsdos)
+  . Fixed bug GH-11791 (Wrong default value of DOMDocument::xmlStandalone).
+    (nielsdos)
+  . Fix json_encode result on DOMDocument. (nielsdos)
+  . Fix manually calling __construct() on DOM classes. (nielsdos)
+  . Fixed bug GH-11830 (ParentNode methods should perform their checks
+    upfront). (nielsdos)
+  . Fix segfault when DOMParentNode::prepend() is called when the child
+    disappears. (nielsdos)
+
+- FFI:
+  . Fix leaking definitions when using FFI::cdef()->new(...). (ilutov)
+
+- MySQLnd:
+  . Fixed bug GH-11440 (authentication to a sha256_password account fails over
+    SSL). (nielsdos)
+  . Fixed bug GH-11438 (mysqlnd fails to authenticate with sha256_password
+    accounts using passwords longer than 19 characters).
+    (nielsdos, Kamil Tekiela)
+  . Fixed bug GH-11550 (MySQL Statement has a empty query result when
+    the response field has changed, also Segmentation fault).
+    (Yurunsoft)
+  . Fixed invalid error message "Malformed packet" when connection is dropped.
+    (Kamil Tekiela)
+
+- Opcache:
+  . Fixed bug GH-11715 (opcache.interned_strings_buffer either has no effect or
+    opcache_get_status() / phpinfo() is wrong). (nielsdos)
+  . Avoid adding an unnecessary read-lock when loading script from shm if
+    restart is in progress. (mikhainin)
+
+- PCNTL:
+  . Revert behaviour of receiving SIGCHLD signals back to the behaviour
+    before 8.1.22. (nielsdos)
+
+- SPL:
+  . Fixed bug #81992 (SplFixedArray::setSize() causes use-after-free).
+    (nielsdos)
+
+- Standard:
+  . Prevent int overflow on $decimals in number_format. (Marc Bennewitz)
+  . Fixed bug GH-11870 (Fix off-by-one bug when truncating tempnam prefix)
+    (athos-ribeiro)
+
 03 Aug 2023, PHP 8.1.22
 
 - Build:

Zend/Optimizer/block_pass.c

@@ -174,8 +174,11 @@ static void zend_optimize_block(zend_basic_block *block, zend_op_array *op_array
 					 && opline->opcode != ZEND_MATCH
 					 && zend_optimizer_update_op1_const(op_array, opline, &c)) {
 						VAR_SOURCE(op1) = NULL;
-						literal_dtor(&ZEND_OP1_LITERAL(src));
-						MAKE_NOP(src);
+						if (opline->opcode != ZEND_JMP_NULL
+						 && !zend_bitset_in(used_ext, VAR_NUM(src->result.var))) {
+							literal_dtor(&ZEND_OP1_LITERAL(src));
+							MAKE_NOP(src);
+						}
 						++(*opt_count);
 					} else {
 						zval_ptr_dtor_nogc(&c);
@@ -197,8 +200,10 @@ static void zend_optimize_block(zend_basic_block *block, zend_op_array *op_array
 				ZVAL_COPY(&c, &ZEND_OP1_LITERAL(src));
 				if (zend_optimizer_update_op2_const(op_array, opline, &c)) {
 					VAR_SOURCE(op2) = NULL;
-					literal_dtor(&ZEND_OP1_LITERAL(src));
-					MAKE_NOP(src);
+					if (!zend_bitset_in(used_ext, VAR_NUM(src->result.var))) {
+						literal_dtor(&ZEND_OP1_LITERAL(src));
+						MAKE_NOP(src);
+					}
 					++(*opt_count);
 				} else {
 					zval_ptr_dtor_nogc(&c);

Zend/zend.c

@@ -1649,9 +1649,15 @@ ZEND_API ZEND_COLD ZEND_NORETURN void zend_error_noreturn(int type, const char *
 
 ZEND_API ZEND_COLD ZEND_NORETURN void zend_strerror_noreturn(int type, int errn, const char *message)
 {
-#ifdef HAVE_STR_ERROR_R
-	char buf[1024];
-	strerror_r(errn, buf, sizeof(buf));
+#ifdef HAVE_STRERROR_R
+	char b[1024];
+
+# ifdef STRERROR_R_CHAR_P
+	char *buf = strerror_r(errn, b, sizeof(b));
+# else
+	strerror_r(errn, b, sizeof(b));
+	char *buf = b;
+# endif
 #else
 	char *buf = strerror(errn);
 #endif

Zend/zend.h

@@ -20,7 +20,7 @@
 #ifndef ZEND_H
 #define ZEND_H
 
-#define ZEND_VERSION "4.1.22"
+#define ZEND_VERSION "4.1.23"
 
 #define ZEND_ENGINE_3
 

Zend/zend_alloc.c

@@ -2416,6 +2416,13 @@ ZEND_API bool is_zend_ptr(const void *ptr)
 {
 #if ZEND_MM_CUSTOM
 	if (AG(mm_heap)->use_custom_heap) {
+		if (AG(mm_heap)->custom_heap.std._malloc == tracked_malloc) {
+			zend_ulong h = ((uintptr_t) ptr) >> ZEND_MM_ALIGNMENT_LOG2;
+			zval *size_zv = zend_hash_index_find(AG(mm_heap)->tracked_allocs, h);
+			if  (size_zv) {
+				return 1;
+			}
+		}
 		return 0;
 	}
 #endif