[php-src] PHP-8.3: Merge branch 'PHP-8.2' into PHP-8.3

Author: Shivam Mathur (shivammathur)
Date: 2026-08-05T12:28:16+05:30

Commit: https://github.com/php/php-src/commit/e0d6b21c595fb0963a2879fa017033d4d132f145
Raw diff: https://github.com/php/php-src/commit/e0d6b21c595fb0963a2879fa017033d4d132f145.diff

Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
  Fix hMailServer URL in Windows CI (#23055)

Changed paths:
  M  .github/scripts/windows/test_task.bat
  M  ext/standard/tests/mail/bug80751.phpt


Diff:

diff --git a/.github/scripts/windows/test_task.bat b/.github/scripts/windows/test_task.bat
index 8ce65b8bde9d..25d6c0eec041 100644
--- a/.github/scripts/windows/test_task.bat
+++ b/.github/scripts/windows/test_task.bat
@@ -115,8 +115,9 @@ set PHP_BUILD_DIR=%PHP_BUILD_OBJ_DIR%\Release
 if "%THREAD_SAFE%" equ "1" set PHP_BUILD_DIR=%PHP_BUILD_DIR%_TS
 
 rem prepare for mail
-curl -sLo hMailServer.exe https://www.hmailserver.com/download_file/?downloadid=271
-hMailServer.exe /verysilent
+curl -sLo hMailServer.zip https://downloads.php.net/~windows/php-sdk/deps/vs18/x64/hmailserver-5.7.0-vs18-x64.zip
+unzip -q hMailServer.zip -d hMailServer
+hMailServer\bin\hMailServer.exe /verysilent
 cd %APPVEYOR_BUILD_FOLDER%
 %PHP_BUILD_DIR%\php.exe -dextension_dir=%PHP_BUILD_DIR% -dextension=com_dotnet appveyor\setup_hmailserver.php
 
diff --git a/ext/standard/tests/mail/bug80751.phpt b/ext/standard/tests/mail/bug80751.phpt
index fd4fa744fe3c..97cb0575f82d 100644
--- a/ext/standard/tests/mail/bug80751.phpt
+++ b/ext/standard/tests/mail/bug80751.phpt
@@ -37,7 +37,7 @@ function find_and_delete_message($username, $subject) {
             if ($info->subject === $subject) {
                 $header = imap_fetchheader($imap_stream, $i);
                 echo "Return-Path header found: ";
-                var_dump(strpos($header, 'Return-Path: [email protected]') !== false);
+                var_dump(strpos($header, 'Return-Path: <[email protected]>') !== false);
                 echo "To header found: ";
                 var_dump(strpos($header, "To: \"<[email protected]>\" <{$users[1]}@$domain>") !== false);
                 echo "From header found: ";