Commit b48597db55a for php.net

commit b48597db55a6d73df16a9bba1277290ccf875d68
Merge: 1765f685479 d841b499b83
Author: ndossche <7771979+ndossche@users.noreply.github.com>
Date:   Mon Sep 21 22:29:43 2026 +0200

    Merge branch 'PHP-8.4' into PHP-8.5

    * PHP-8.4:
      Fix GH-23619: ext/ftp: cryptic error on servers that don't support TLS session resumption on data connection

diff --cc NEWS
index ae13afd8c35,f76464756f3..b57861f4656
--- a/NEWS
+++ b/NEWS
@@@ -23,7 -21,13 +23,11 @@@ PH
    . Fixed Dom\HTMLDocument giving attributes the namespace of their element
      when a fragment is parsed with an xlink, xml or xmlns context element.
      (Ilia Alshanetsky)
 -  . Fixed bug GH-23729 (DOMXPath::__construct() use-after-free during an
 -    evaluation). (David Carlier)

+ - FTP:
+   . Fixed bug GH-23619 (cryptic error on servers that don't support TLS
+     session resumption on data connection). (ndossche)
+
  - Intl:
    . Fixed cloning IntlDateFormatter and MessageFormatter losing PHP-side state
      such as dateType, timeType, calendar and the message pattern.