Sync with upstream: ext/opcache, ext/sockets

Author: petk

CHANGELOG.md

@@ -7,10 +7,14 @@ repository.
 
 * C11 standard
 
-New configuration variables:
+New configuration options:
 
 * PHP_SYSTEM_GLOB
 
+Removed configuration options:
+
+* PHP_EXT_OPCACHE
+
 ## PHP 8.4
 
 New configuration variables:

cmake/cmake/platforms/Windows.cmake

@@ -51,6 +51,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   # known on Windows targets.
   ##############################################################################
 
+  set(HAVE_ACCEPT4 FALSE)
   set(HAVE_ALPHASORT FALSE)
   set(HAVE_ARC4RANDOM_BUF FALSE)
   set(HAVE_ARPA_INET_H FALSE)

cmake/cmake/presets/all-disabled.json

@@ -15,7 +15,6 @@
         "PHP_EXT_FILTER": false,
         "PHP_EXT_ICONV": false,
         "PHP_EXT_LIBXML": false,
-        "PHP_EXT_OPCACHE": false,
         "PHP_EXT_PDO": false,
         "PHP_EXT_PDO_SQLITE": false,
         "PHP_EXT_PHAR": false,

cmake/ext/CMakeLists.txt

@@ -30,6 +30,7 @@ set_property(
       hash
       json
       lexbor
+      opcache
       pcre
       random
       reflection

cmake/ext/opcache/CMakeLists.txt

@@ -5,10 +5,13 @@ This extension enables the PHP OPcode caching engine.
 
 ## PHP_EXT_OPCACHE
 
+:red_circle: *Removed as of PHP 8.5.*
+
 * Default: `ON`
 * Values: `ON|OFF`
 
-Enable the extension. This extension is always built as shared when enabled.
+Enable the extension. This extension is always built as shared when enabled. As
+of PHP 8.5, this extension is always enabled and cannot be disabled.
 
 ## PHP_EXT_OPCACHE_HUGE_CODE_PAGES
 
@@ -44,46 +47,32 @@ include(CMakeDependentOption)
 include(FeatureSummary)
 include(PHP/SearchLibraries)
 
-option(PHP_EXT_OPCACHE "Enable the Zend OPcache extension" ON)
 add_feature_info(
   "ext/opcache"
-  PHP_EXT_OPCACHE
+  TRUE
   "PHP OPcode caching engine"
 )
 
 cmake_dependent_option(
   PHP_EXT_OPCACHE_HUGE_CODE_PAGES
   "Enable copying PHP CODE pages into HUGE PAGES"
   ON
-  [[PHP_EXT_OPCACHE AND NOT CMAKE_SYSTEM_NAME STREQUAL "Windows"]]
+  [[NOT CMAKE_SYSTEM_NAME STREQUAL "Windows"]]
   OFF
 )
 
-cmake_dependent_option(
-  PHP_EXT_OPCACHE_JIT
-  "Enable JIT (just-in-time) compilation"
-  ON
-  PHP_EXT_OPCACHE
-  OFF
-)
+option(PHP_EXT_OPCACHE_JIT "Enable JIT (just-in-time) compilation" ON)
 
-cmake_dependent_option(
+option(
   PHP_EXT_OPCACHE_CAPSTONE
   "Support OPcache JIT disassembly through Capstone engine"
-  OFF
-  PHP_EXT_OPCACHE
-  OFF
 )
 
-if(NOT PHP_EXT_OPCACHE)
-  return()
-endif()
-
 ################################################################################
 # Add library.
 ################################################################################
 
-add_library(php_ext_opcache MODULE)
+add_library(php_ext_opcache OBJECT)
 
 target_sources(
   php_ext_opcache

cmake/ext/sockets/CMakeLists.txt

@@ -91,6 +91,11 @@ target_link_libraries(
     $<$<PLATFORM_ID:Windows>:ws2_32;iphlpapi>
 )
 
+cmake_push_check_state(RESET)
+  set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
+  check_symbol_exists(accept4 "sys/types.h;sys/socket.h" HAVE_ACCEPT4)
+cmake_pop_check_state()
+
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
   check_symbol_exists(hstrerror "netdb.h;sys/socket.h" HAVE_HSTRERROR)

cmake/ext/sockets/cmake/config.h.in

@@ -1,3 +1,6 @@
+/* Define to 1 if you have the 'accept4' function. */
+#cmakedefine HAVE_ACCEPT4 1
+
 /* Define to 1 if you have the 'hstrerror' function. */
 #cmakedefine HAVE_HSTRERROR 1
 

docs/cmake/configuration.md

@@ -2337,19 +2337,19 @@ A list of Autoconf `configure` command-line configuration options, Windows
       <td>--enable-opcache</td>
       <td>--enable-opcache</td>
       <td>PHP_EXT_OPCACHE=ON</td>
-      <td>default, will be shared</td>
+      <td>default, will be shared; removed since PHP >= 8.5</td>
     </tr>
     <tr>
       <td>&emsp;--enable-opcache=shared</td>
       <td>--enable-opcache=shared</td>
       <td>PHP_EXT_OPCACHE=ON</td>
-      <td>will be shared</td>
+      <td>will be shared; removed since PHP >= 8.5</td>
     </tr>
     <tr>
       <td>&emsp;--disable-opcache</td>
       <td>--disable-opcache</td>
       <td>PHP_EXT_OPCACHE=OFF</td>
-      <td></td>
+      <td>removed since PHP >= 8.5</td>
     </tr>
     <tr>
       <td>&emsp;--enable-huge-code-pages</td>

docs/cmake/ext/opcache.md

@@ -7,10 +7,13 @@ This extension enables the PHP OPcode caching engine.
 
 ## PHP_EXT_OPCACHE
 
+:red_circle: *Removed as of PHP 8.5.*
+
 * Default: `ON`
 * Values: `ON|OFF`
 
-Enable the extension. This extension is always built as shared when enabled.
+Enable the extension. This extension is always built as shared when enabled. As
+of PHP 8.5, this extension is always enabled and cannot be disabled.
 
 ## PHP_EXT_OPCACHE_HUGE_CODE_PAGES
 

docs/evolution.md

@@ -941,11 +941,14 @@ PHP coding standards now use the C11 standard.
   50.1 to 57.1.
 * Minimum required SQLite library version has been increased from 3.7.7 to
   3.7.17.
-* Bundled file library in ext/fileinfo upgraded to 5.46.
+* Bundled file library in ext/fileinfo has been upgraded from 5.45 to 5.46.
 * Bundled pcre2lib in ext/pcre upgraded from 10.44 to 10.45.
 * Added new extensions lexbor and uri as always enabled.
 * The `SIZEOF_INTMAX_T` preprocessor macro has been removed.
 * The `SIZEOF_PTRDIFF_T` preprocessor macro has been removed.
+* The Opcache extension (ext/opcache) is now always built into the PHP binary
+  and is always loaded. The `--enable-opcache`/`--disable-opcache` configure
+  options have been removed.
 
 #### Autotools