Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/cmake/toolchains/template.cmake

@@ -55,9 +55,10 @@ set(ZEND_MM_EXITCODE__TRYRUN_OUTPUT "(size_t)8 (size_t)3 0")
 set(PHP_SAPI_FPM_HAS_PTRACE_EXITCODE 0)
 
 # Set the process memory access file - 'mem' on Linux-alike or 'as' on
-# Solaris-alike target systems for the PHP FPM to use pread trace type.
-# (/proc/<pid>/<mem-or-as>)
-set(PROC_MEM_FILE mem)
+# Solaris-alike target systems for the PHP FPM to use pread trace type
+# (/proc/<pid>/<mem-or-as>), when neither 'ptrace' nor 'mach_vm_read' functions
+# work.
+set(PHP_SAPI_FPM_PROC_MEM_FILE mem)
 
 ################################################################################
 # ext/gd

cmake/sapi/fpm/cmake/CheckTrace.cmake

@@ -3,12 +3,9 @@ Check FPM trace implementation.
 
 Result variables:
 
-* HAVE_PTRACE - Whether ptrace() is present and works as expected.
-* HAVE_MACH_VM_READ - Whether ptrace() didn't work and the mach_vm_read() is
-  present.
-* PROC_MEM_FILE - If neither ptrace() or mach_vm_read() works, the
-  /proc/pid/<file> interface ('mem' or 'as') is set if found and works as
-  expected.
+* HAVE_PTRACE
+* HAVE_MACH_VM_READ
+* PROC_MEM_FILE
 #]=============================================================================]
 
 include(CheckSourceRuns)
@@ -113,14 +110,15 @@ if(NOT PHP_SAPI_FPM_HAS_PTRACE AND NOT PHP_SAPI_FPM_HAS_MACH_VM_READ)
   message(CHECK_START "Checking for process memory access file")
 
   if(NOT CMAKE_CROSSCOMPILING)
-    set(PROC_MEM_FILE "")
-    if(EXISTS /proc/self/mem)
-      set(PROC_MEM_FILE "mem")
-    elseif(EXISTS /proc/self/as)
-      set(PROC_MEM_FILE "as")
+    if(NOT DEFINED PHP_SAPI_FPM_PROC_MEM_FILE)
+      if(EXISTS /proc/self/mem)
+        set(PHP_SAPI_FPM_PROC_MEM_FILE "mem")
+      elseif(EXISTS /proc/self/as)
+        set(PHP_SAPI_FPM_PROC_MEM_FILE "as")
+      endif()
     endif()
 
-    if(PROC_MEM_FILE)
+    if(PHP_SAPI_FPM_PROC_MEM_FILE)
       cmake_push_check_state(RESET)
         set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
         set(CMAKE_REQUIRED_QUIET TRUE)
@@ -138,7 +136,7 @@ if(NOT PHP_SAPI_FPM_HAS_PTRACE AND NOT PHP_SAPI_FPM_HAS_MACH_VM_READ)
             long v1 = (unsigned int) -1, v2 = 0;
             char buf[128];
             int fd;
-            sprintf(buf, \"/proc/%d/${PROC_MEM_FILE}\", getpid());
+            sprintf(buf, \"/proc/%d/${PHP_SAPI_FPM_PROC_MEM_FILE}\", getpid());
             fd = open(buf, O_RDONLY);
             if (0 > fd) {
               return 1;
@@ -154,13 +152,14 @@ if(NOT PHP_SAPI_FPM_HAS_PTRACE AND NOT PHP_SAPI_FPM_HAS_MACH_VM_READ)
       cmake_pop_check_state()
 
       if(NOT PHP_HAS_PROC_MEM_FILE)
-        unset(PROC_MEM_FILE)
+        unset(PHP_SAPI_FPM_PROC_MEM_FILE)
       endif()
     endif()
   endif()
 
-  if(PROC_MEM_FILE)
-    message(CHECK_PASS "yes (${PROC_MEM_FILE})")
+  if(PHP_SAPI_FPM_PROC_MEM_FILE)
+    message(CHECK_PASS "yes (${PHP_SAPI_FPM_PROC_MEM_FILE})")
+    set(PROC_MEM_FILE "${PHP_SAPI_FPM_PROC_MEM_FILE}")
   else()
     message(CHECK_FAIL "no")
   endif()

cmake/sapi/fpm/cmake/config.h.in

@@ -31,13 +31,14 @@
 /* Define to 1 if you have 'TCP_INFO'. */
 #cmakedefine HAVE_LQ_TCP_INFO 1
 
-/* Define to 1 if you have the 'mach_vm_read' function. */
+/* Define to 1 if the system has the 'mach_vm_read' function (used when the
+   'ptrace' function doesn't work). */
 #cmakedefine HAVE_MACH_VM_READ 1
 
 /* Define to 1 if you have the 'port_create' function. */
 #cmakedefine HAVE_PORT_CREATE 1
 
-/* Define to 1 if you have the 'ptrace' function. */
+/* Define to 1 if the system has a working 'ptrace' function. */
 #cmakedefine HAVE_PTRACE 1
 
 /* Define to 1 if system has a working 'select' function. */
@@ -64,5 +65,8 @@
 /* Define to 1 if you have the 'times' function. */
 #cmakedefine HAVE_TIMES 1
 
-/* Define to the /proc/pid/mem interface filename value. */
+/* The process memory access filename - 'mem' on Linux-alike or 'as' on
+   Solaris-alike target systems for the PHP FPM to use pread trace type
+   (/proc/<pid>/<mem-or-as>), when neither 'ptrace' nor 'mach_vm_read'
+   functions work. */
 #cmakedefine PROC_MEM_FILE "@PROC_MEM_FILE@"