PoC single entrypoint for non-phpt tests

.github/actions/apk/action.yml

@@ -6,6 +6,8 @@ runs:
       run: |
         set -x
 
+        OPCACHE_TLS_TESTS_DEPS="clang gcc binutils-gold lld"
+
         apk update -q
         apk add \
             util-linux \
@@ -53,4 +55,5 @@ runs:
             postgresql14-dev \
             tzdata \
             musl-locales \
-            musl-locales-lang
+            musl-locales-lang \
+            $OPCACHE_TLS_TESTS_DEPS

.github/actions/apt-x32/action.yml

@@ -6,6 +6,8 @@ runs:
       run: |
         set -x
 
+        OPCACHE_TLS_TESTS_DEPS="gcc clang lld"
+
         export DEBIAN_FRONTEND=noninteractive
         dpkg --add-architecture i386
         apt-get update -y | true
@@ -44,4 +46,5 @@ runs:
           re2c \
           unzip \
           wget \
-          zlib1g-dev:i386
+          zlib1g-dev:i386 \
+          $OPCACHE_TLS_TESTS_DEPS

.github/actions/apt-x64/action.yml

@@ -10,6 +10,8 @@ runs:
       run: |
         set -x
 
+        OPCACHE_TLS_TESTS_DEPS="gcc clang lld"
+
         export DEBIAN_FRONTEND=noninteractive
 
         # Install sudo in Docker for consistent actions
@@ -74,4 +76,5 @@ runs:
           libqdbm-dev \
           libjpeg-dev \
           libpng-dev \
-          libfreetype6-dev
+          libfreetype6-dev \
+          $OPCACHE_TLS_TESTS_DEPS \

.github/actions/extra-tests/action.yml

@@ -0,0 +1,7 @@
+name: Extra tests
+runs:
+  using: composite
+  steps:
+    - shell: sh
+      run: |
+        sapi/cli/php run-extra-tests.php

.github/actions/freebsd/action.yml

@@ -3,6 +3,9 @@ inputs:
   configurationParameters:
     default: ''
     required: false
+  runExtraTests:
+    default: false
+    required: false
 runs:
   using: composite
   steps:
@@ -17,6 +20,8 @@ runs:
         prepare: |
           cd $GITHUB_WORKSPACE
 
+          OPCACHE_TLS_TESTS_DEPS="gcc"
+
           kldload accf_http
           pkg install -y \
             autoconf \
@@ -41,9 +46,11 @@ runs:
             webp \
             libavif \
             `#sqlite3` \
-            curl
+            curl \
+            $OPCACHE_TLS_TESTS_DEPS
 
           ./buildconf -f
+          CC=clang CXX=clang++ \
           ./configure \
             --prefix=/usr/local \
             --enable-debug \
@@ -108,3 +115,7 @@ runs:
             --show-slow 1000 \
             --set-timeout 120 \
             -d zend_extension=opcache.so
+
+          if test "${{ inputs.runExtraTests }}" = "true"; then
+            sapi/cli/php run-extra-tests.php
+          fi

.github/workflows/nightly.yml

@@ -134,6 +134,8 @@ jobs:
             --asan -x
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
+      - name: Extra tests
+        uses: ./.github/actions/extra-tests
       - name: Notify Slack
         if: failure()
         uses: ./.github/actions/notify-slack
@@ -266,6 +268,8 @@ jobs:
             ${{ matrix.run_tests_parameters }}
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
+      - name: Extra tests
+        uses: ./.github/actions/extra-tests
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
       - name: Notify Slack
@@ -355,6 +359,10 @@ jobs:
             ${{ matrix.run_tests_parameters }}
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
+      - name: Extra tests
+        uses: ./.github/actions/extra-tests
+        with:
+          debug: ${{ matrix.debug }}
       - name: Notify Slack
         if: failure()
         uses: ./.github/actions/notify-slack
@@ -414,6 +422,8 @@ jobs:
           runTestsParameters: >-
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
+      - name: Extra tests
+        uses: ./.github/actions/extra-tests
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
       - name: Notify Slack
@@ -1076,3 +1086,4 @@ jobs:
         with:
           configurationParameters: >-
             --${{ matrix.zts && 'enable' || 'disable' }}-zts
+          runExtraTests: true

NEWS

@@ -11,6 +11,10 @@ PHP                                                                        NEWS
   . Add support for CURLINFO_CONN_ID in curl_getinfo() (thecaliskan)
   . Add support for CURLINFO_QUEUE_TIME_T in curl_getinfo() (thecaliskan)
 
+- OpenSSL:
+  . Add $digest_algo parameter to openssl_public_encrypt() and
+    openssl_private_decrypt() functions. (Jakub Zelenka)
+
 - Reflection:
   . Fixed bug GH-19187 (ReflectionNamedType::getName() prints nullable type when
     retrieved from ReflectionProperty::getSettableType()). (ilutov)

UPGRADING

@@ -327,6 +327,10 @@ PHP 8.5 UPGRADE NOTES
 - libxml:
   . libxml_set_external_entity_loader() now has a formal return type of true.
 
+- OpenSSL:
+  . openssl_public_encrypt() and openssl_private_decrypt() have new parameter
+    $digest_algo that allows specifying hash digest algorith for OEAP padding.
+
 - PCNTL:
   . pcntl_exec() now has a formal return type of false.
   . pcntl_waitid() takes an additional resource_usage argument to

ext/ftp/ftp.c

@@ -1382,7 +1382,8 @@ static int my_poll(php_socket_t fd, int events, int timeout) {
 
 		if (n == -1 && php_socket_errno() == EINTR) {
 			zend_hrtime_t delta_ns = zend_hrtime() - start_ns;
-			if (delta_ns > timeout_hr) {
+			/* delta_ns == 0 is only possible with a platform that does not support a high-res timer. */
+			if (delta_ns > timeout_hr || UNEXPECTED(delta_ns == 0)) {
 #ifndef PHP_WIN32
 				errno = ETIMEDOUT;
 #endif

ext/opcache/config.m4

@@ -73,19 +73,23 @@ if test "$PHP_OPCACHE" != "no"; then
         IR_TARGET=IR_TARGET_X64
         DASM_FLAGS="-D X64APPLE=1 -D X64=1"
         DASM_ARCH="x86"
+        TLS_TARGET="darwin"
       ],
       [*x86_64*|amd64-*-freebsd*], [
         IR_TARGET=IR_TARGET_X64
         DASM_FLAGS="-D X64=1"
         DASM_ARCH="x86"
+        TLS_TARGET="x86_64"
       ],
       [[i[34567]86*|x86*]], [
         IR_TARGET=IR_TARGET_X86
         DASM_ARCH="x86"
+        TLS_TARGET="x86"
       ],
       [aarch64*], [
         IR_TARGET=IR_TARGET_AARCH64
         DASM_ARCH="aarch64"
+        TLS_TARGET="aarch64"
       ])
 
     AS_VAR_IF([PHP_CAPSTONE], [yes],
@@ -102,6 +106,10 @@ if test "$PHP_OPCACHE" != "no"; then
 
     JIT_CFLAGS="-I@ext_builddir@/jit/ir -D$IR_TARGET -DIR_PHP"
     AS_VAR_IF([ZEND_DEBUG], [yes], [JIT_CFLAGS="$JIT_CFLAGS -DIR_DEBUG"])
+
+    AS_VAR_IF([PHP_THREAD_SAFETY], [yes], [
+      ZEND_JIT_SRC="$ZEND_JIT_SRC jit/tls/zend_jit_tls_$TLS_TARGET.c"
+    ])
   ])
 
   AC_CHECK_FUNCS([mprotect shm_create_largepage])

ext/opcache/config.w32

@@ -33,6 +33,7 @@ if (PHP_OPCACHE != "no") {
 			DEFINE("IR_TARGET", ir_target);
 			DEFINE("DASM_FLAGS", dasm_flags);
 			DEFINE("DASM_ARCH", "x86");
+			DEFINE("TLS_TARGET", "win");
 
 			AC_DEFINE('HAVE_JIT', 1, 'Define to 1 to enable JIT.');
 
@@ -52,6 +53,11 @@ if (PHP_OPCACHE != "no") {
 			ADD_SOURCES(configure_module_dirname + "\\jit",
 				"zend_jit.c zend_jit_vm_helpers.c",
 				"opcache", "ext\\opcache\\jit");
+			if (PHP_ZTS == "yes") {
+				ADD_SOURCES(configure_module_dirname + "\\jit\\tls",
+					"zend_jit_tls_win.c",
+					"opcache", "ext\\opcache\\jit\\tls");
+			}
 			ADD_SOURCES(configure_module_dirname + "\\jit\\ir",
 				"ir.c", "opcache", "ext\\opcache\\jit\\ir");
 			ADD_SOURCES(configure_module_dirname + "\\jit\\ir",

ext/opcache/jit/tls/testing/.gitignore

@@ -0,0 +1,4 @@
+*.so
+*.o
+main
+main.dSYM