[php-src] PHP-8.5: Merge branch 'PHP-8.4' into PHP-8.5

Author: Shivam Mathur (shivammathur)
Date: 2026-08-05T12:31:54+05:30

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

Merge branch 'PHP-8.4' into PHP-8.5

* PHP-8.4:
  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 4ce2bd96ce66..77b0059fccf4 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 .github\setup_hmailserver.php
 
diff --git a/ext/standard/tests/mail/bug80751.phpt b/ext/standard/tests/mail/bug80751.phpt
index b6dc29e42f14..802bd542482d 100644
--- a/ext/standard/tests/mail/bug80751.phpt
+++ b/ext/standard/tests/mail/bug80751.phpt
@@ -48,7 +48,7 @@ foreach (['to' => $to, 'cc' => $cc, 'bcc' => $bcc] as $recipient => $mailAddress
         echo "Found the email. {$recipient} received.\n";
     }
 
-    if ($mail->getHeader('Return-Path') === $from) {
+    if ($mail->getHeader('Return-Path') === "<{$from}>") {
         echo "Return-Path is as expected.\n";
     }