Merge remote-tracking branch 'origin/master' into opcache/opcache_is_script_cached_file

Author: iamacarpet

.github/scripts/windows/build_task.bat

@@ -5,11 +5,6 @@ if /i "%GITHUB_ACTIONS%" neq "True" (
     exit /b 3
 )
 
-del /f /q C:\Windows\System32\libcrypto-1_1-x64.dll >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-del /f /q C:\Windows\System32\libssl-1_1-x64.dll >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-
 call %~dp0find-target-branch.bat
 set STABILITY=staging
 set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%BRANCH%-%PHP_SDK_VS%-%PHP_SDK_ARCH%
@@ -32,7 +27,11 @@ if "%THREAD_SAFE%" equ "0" set ADD_CONF=%ADD_CONF% --disable-zts
 if "%INTRINSICS%" neq "" set ADD_CONF=%ADD_CONF% --enable-native-intrinsics=%INTRINSICS%
 if "%ASAN%" equ "1" set ADD_CONF=%ADD_CONF% --enable-sanitizer --enable-debug-pack
 
-set CFLAGS=/W2 /WX /w14013 /wd4146 /wd4244
+rem C4018: comparison: signed/unsigned mismatch
+rem C4146: unary minus operator applied to unsigned type
+rem C4244: type conversion, possible loss of data
+rem C4267: 'size_t' type conversion, possible loss of data
+set CFLAGS=/W3 /WX /wd4018 /wd4146 /wd4244 /wd4267
 
 cmd /c configure.bat ^
 	--enable-snapshot-build ^
@@ -46,5 +45,7 @@ if %errorlevel% neq 0 exit /b 3
 
 nmake /NOLOGO
 if %errorlevel% neq 0 exit /b 3
+nmake /NOLOGO comtest.dll
+if %errorlevel% neq 0 exit /b 3
 
 exit /b 0

.github/scripts/windows/test_task.bat

@@ -118,6 +118,9 @@ hMailServer.exe /verysilent
 cd %APPVEYOR_BUILD_FOLDER%
 %PHP_BUILD_DIR%\php.exe -dextension_dir=%PHP_BUILD_DIR% -dextension=com_dotnet .github\setup_hmailserver.php
 
+rem prepare for com_dotnet
+nmake register_comtest
+
 mkdir %PHP_BUILD_DIR%\test_file_cache
 rem generate php.ini
 echo extension_dir=%PHP_BUILD_DIR% > %PHP_BUILD_DIR%\php.ini
@@ -138,6 +141,8 @@ editbin /stack:8388608 %PHP_BUILD_DIR%\php-cgi.exe
 
 set TEST_PHPDBG_EXECUTABLE=%PHP_BUILD_DIR%\phpdbg.exe
 
+copy /-y %DEPS_DIR%\bin\*.dll %PHP_BUILD_DIR%\*
+
 if "%ASAN%" equ "1" set ASAN_OPTS=--asan
 
 mkdir c:\tests_tmp
@@ -146,6 +151,7 @@ nmake test TESTS="%OPCACHE_OPTS% -g FAIL,BORK,LEAK,XLEAK %ASAN_OPTS% --no-progre
 
 set EXIT_CODE=%errorlevel%
 
+nmake unregister_comtest
 taskkill /f /im snmpd.exe
 
 exit /b %EXIT_CODE%

.gitignore

@@ -290,6 +290,11 @@ tmp-php.ini
 /junit.out.xml
 /.ccache/
 
+# ------------------------------------------------------------------------------
+# Additional test build files
+# ------------------------------------------------------------------------------
+/ext/standard/tests/helpers/bad_cmd.exe
+
 # ------------------------------------------------------------------------------
 # Special cases to invert previous ignore patterns
 # ------------------------------------------------------------------------------

NEWS

@@ -2,6 +2,10 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.5.0alpha1
 
+- CLI:
+  . Extended --ini to print INI settings changed from the builtin default.
+    (timwolla)
+
 - COM:
   . Fixed property access of PHP objects wrapped in variant. (cmb)
   . Fixed method calls for PHP objects wrapped in variant. (cmb)
@@ -24,6 +28,8 @@ PHP                                                                        NEWS
 - Curl:
   . Added curl_multi_get_handles(). (timwolla)
   . Added curl_share_init_persistent(). (enorris)
+  . Added CURLINFO_USED_PROXY, CURLINFO_HTTPAUTH_USED, and CURLINFO_PROXYAUTH_USED
+    support to curl_getinfo. (Ayesh Karunaratne)
 
 - Date:
   . Fix undefined behaviour problems regarding integer overflow in extreme edge
@@ -37,6 +43,9 @@ PHP                                                                        NEWS
   . Added enchant_dict_remove_from_session(). (nielsdos)
   . Added enchant_dict_remove(). (nielsdos)
 
+- Fileinfo:
+  . Upgrade to file 5.46. (nielsdos)
+
 - GD:
   . Fixed bug #68629 (Transparent artifacts when using imagerotate). (pierre,
     cmb)
@@ -58,6 +67,9 @@ PHP                                                                        NEWS
 - Output:
   . Fixed calculation of aligned buffer size. (cmb)
 
+- PCRE:
+  . Upgraded to pre2lib from 10.44 to 10.45. (nielsdos)
+
 - PDO_PGSQL:
   . Added Iterable support for PDO::pgsqlCopyFromArray. (KentarouTakeda)
   . Implement GH-15387 Pdo\Pgsql::setAttribute(PDO::ATTR_PREFETCH, 0) or
@@ -128,6 +140,7 @@ PHP                                                                        NEWS
     (David Carlier)
   . socket_getsockname/socket_create/socket_bind handled AF_PACKET family socket.
     (David Carlier)
+  . Added IP_BINDANY for a socket to bind to any address. (David Carlier)
 
 - Sodium:
   . Fix overall theorical overflows on zend_string buffer allocations.
@@ -160,6 +173,7 @@ PHP                                                                        NEWS
     is now a boolean. (David Carlier)
   . Fixed bug GH-16883 (gzopen() does not use the default stream context when
     opening HTTP URLs). (nielsdos)
+  . Implemented GH-17668 (zlib streams should support locking). (nielsdos)
 
 
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>

TSRM/tsrm_win32.c

@@ -636,7 +636,7 @@ TSRM_API int shmget(key_t key, size_t size, int flags)
 {/*{{{*/
 	shm_pair *shm;
 	char shm_segment[sizeof(SEGMENT_PREFIX INT_MIN_AS_STRING)];
-	HANDLE shm_handle = NULL, info_handle = NULL;
+	HANDLE shm_handle = NULL;
 	BOOL created = FALSE;
 
 	if (key != IPC_PRIVATE) {

UPGRADING

@@ -61,6 +61,13 @@ PHP 8.5 UPGRADE NOTES
     array value reference assignment: $ctor_args = [&$valByRef]
   . Attempting to modify a PDOStatement during a call to PDO::fetch(),
     PDO::fetchObject(), PDO::fetchAll() will now throw an Error.
+  . The value of the constants PDO::FETCH_GROUP, PDO::FETCH_UNIQUE,
+    PDO::FETCH_CLASSTYPE, PDO::FETCH_PROPS_LATE, and PDO::FETCH_SERIALIZE
+    has changed.
+  . A ValueError is now thrown if PDO::FETCH_PROPS_LATE is used with a fetch
+    mode different than PDO::FETCH_CLASS, consistent with other fetch flags.
+  . A ValueError is now thrown if PDO::FETCH_INTO is used as a fetch mode in
+    PDO::fetchAll(), similar to PDO::FETCH_LAZY.
 
 - PDO_FIREBIRD:
   . A ValueError is now thrown when trying to set a cursor name that is too
@@ -88,6 +95,18 @@ PHP 8.5 UPGRADE NOTES
   . Added support for share handles that are persisted across multiple PHP
     requests, safely allowing for more effective connection reuse.
     RFC: https://wiki.php.net/rfc/curl_share_persistence_improvement
+  . Added support for CURLINFO_USED_PROXY (libcurl >= 8.7.0),
+    CURLINFO_HTTPAUTH_USED, and CURLINFO_PROXYAUTH_USED
+    (libcurl >= 8.12.0) to the curl_getinfo() function.
+    When curl_getinfo() returns an array, the same information
+    is available as "used_proxy", "httpauth_used", and "proxyauth_used"
+    keys.
+    CURLINFO_USED_PROXY gets zero set if no proxy was used in the
+    previous transfer or a non-zero value if a proxy was used.
+    CURLINFO_HTTPAUTH_USED and CURLINFO_PROXYAUTH_USED get bitmasks
+    indicating the http and proxy authentication methods that were
+    used in the previous request. See CURLAUTH_* constants for
+    possible values.
 
 - DOM:
   . Added Dom\Element::$outerHTML.
@@ -100,13 +119,18 @@ PHP 8.5 UPGRADE NOTES
     and is not a QName because in those cases the namespace is taken
     from the namespace href or prefix respectively.
 
+- Zlib:
+  . flock() is now supported on zlib streams. Previously, this always
+    failed to perform any locking action.
+
 ========================================
 3. Changes in SAPI modules
 ========================================
 
 - CLI:
   . Trying to set a process title that is too long with cli_set_process_title()
     will now fail instead of silently truncating the given title.
+  . --ini will now print INI settings changed from the builtin default.
 
 ========================================
 4. Deprecated Functionality
@@ -155,7 +179,7 @@ PHP 8.5 UPGRADE NOTES
 
 - Session:
   . session_start is stricter in regard of the option argument.
-    it throws a ValueError if the whole is not a hashmap or
+    It throws a ValueError if the whole is not a hashmap or
     a TypeError if read_on_close value is not a valid type
     compatible with int.
 
@@ -170,7 +194,7 @@ PHP 8.5 UPGRADE NOTES
   . socket_create_listen, socket_bind and socket_sendto throw a
     ValueError if the port is lower than 0 or greater than 65535,
     also if any of the hints array entry is indexes numerically.
-  . socket_addrinfo_lookup throw a TypeError if any of the hints
+  . socket_addrinfo_lookup throws a TypeError if any of the hints
     values cannot be cast to a int and can throw a ValueError if
     any of these values overflow.
   . socket_set_option with MCAST_LEAVE_GROUP/MCAST_LEAVE_SOURCE_GROUP
@@ -235,6 +259,12 @@ PHP 8.5 UPGRADE NOTES
 9. Other Changes to Extensions
 ========================================
 
+- Fileinfo:
+  . Upgraded to file 5.46.
+
+- PCRE:
+  . Upgraded to pcre2lib from 10.44 to 10.45.
+
 - Readline:
   . The return types of readline_add_history(), readline_clear_history(), and
     readline_callback_handler_install() have been changed to true, rather
@@ -247,6 +277,11 @@ PHP 8.5 UPGRADE NOTES
 - Core:
   . PHP_BUILD_DATE.
 
+- Curl:
+  . CURLINFO_USED_PROXY.
+  . CURLINFO_HTTPAUTH_USED.
+  . CURLINFO_PROXYAUTH_USED.
+
 - POSIX:
   . POSIX_SC_OPEN_MAX.
 
@@ -259,6 +294,7 @@ PHP 8.5 UPGRADE NOTES
   . TCP_REUSPORT_LB_NUMA_CURDOM (FreeBSD only).
   . TCP_BBR_ALGORITHM (FreeBSD only).
   . AF_PACKET (Linux only).
+  . IP_BINDANY (FreeBSD/NetBSD/OpenBSD only).
 
 ========================================
 11. Changes to INI File Handling
@@ -328,6 +364,10 @@ PHP 8.5 UPGRADE NOTES
 14. Performance Improvements
 ========================================
 
+- ReflectionProperty:
+  . Improved performance of the following methods: getValue(), getRawValue(),
+    isInitialized(), setValue(), setRawValue().
+
 - XMLReader:
   . Improved property access performance.
 

Zend/tests/ArrayAccess_indirect_append.phpt renamed to Zend/tests/ArrayAccess/ArrayAccess_indirect_append.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Bug #81626: Error on use static:: in __сallStatic() wrapped to Closure::fromCallable()
+Bug #81626: Error on use static:: in __callStatic() wrapped to Closure::fromCallable()
 --FILE--
 <?php
 class TestClass {