Commit 19a386ec1cf for php

commit 19a386ec1cf341003cfd54975e81fc0366a9549f
Merge: e284d8c25bd 5d32ef2a6f4
Author: Weilin Du <weilindu@php.net>
Date:   Sun Oct 25 21:56:40 2026 +0800

    Merge branch 'PHP-8.5' into PHP-8.6

    * PHP-8.5:
      Merge branch 'PHP-8.4' into PHP-8.5
      ext/zip: Exclude broken libzip 1.12 (#24358)

diff --cc NEWS
index 1d89beaec1a,c4d5d12def1..25d63d6a6d5
--- a/NEWS
+++ b/NEWS
@@@ -1,66 -1,8 +1,70 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? ????, PHP 8.5.13
 +?? ??? ????, PHP 8.6.0RC5

  - Core:
 +  . Fix function and constant imports in compile_to_ast and add support
 +    for grouping. (Klaas Skelte van der Werf)
 +
 +- DBA:
 +  . Fixed bug GH-24641 (ndbm backend never checks dbm_open() return value,
 +    NULL deref on first use after a failed open). (Girgias)
 +
 +- DOM:
 +  . Fix error paths in dom_xml_serializing_a_document_node(). (ndossche)
 +
 +- Hash:
 +  . Fix GOST and Snefru digests of 512 MiB or more. (Martin Mirchev)
 +
 +- Opcache:
 +  . Fixed tracing JIT returning a wrapped integer instead of a float on
 +    integer overflow after an integer was compared with a float or
 +    numeric-string literal. (Ilia Alshanetsky)
 +  . Fixed use-after-free in JIT ASSIGN_DIM_OP when concatenating into an
 +    empty array element. (jorgsowa)
 +  . Fixed bug GH-24396 (Assertion failure in zend_jit_def_reg() "reg forwarding"
 +    with chained Pi nodes). (ndossche)
 +  . Fixed JIT treating an array as packed after a string key write turned it
 +    into a hash. (jorgsowa)
 +
 +- PDO_PGSQL:
 +  . Fixed bug GH-24461 (DISCARD ALL on persistent connection cleanup drops
 +    PgBouncer's prepared statements). (David Carlier, Artem Ukrainskiy)
 +
 +- SAPI:
 +  . Fixed infinite loop in sapi_header_op() for headers of 4 GiB or more.
 +    (Martin Mirchev)
 +
 +- SPL:
 +  . Fixed bug GH-24264 (Unwind/GracefulExit discarded in spl_iterators.c).
 +    (Lazizbek Ergashev)
 +
 +- Standard:
 +  . Fixed bug GH-24308 (Request shutdown calls closelog() even when syslog
 +    was not opened by PHP). (lazerg)
 +
 +- Streams:
 +  . Fixed bug GH-24506 (stream_select() leaks a stream-error operation level
 +    on its FD_SETSIZE failure path). (azjezz)
 +  . Fixed bug GH-24508 (HTTP wrapper leaks the dechunk filter when header
 +    parsing fails after Transfer-Encoding). (bercedev)
 +  . Fixed bug GH-24509 (HTTP wrapper leaks Location buffer on empty
 +    Location header). (bercedev)
 +
++- Zip:
++  . Excluded libzip 1.12.0 due to a regression preventing additions and
++    replacements in torrentzip archives. (Weilin Du)
++
 +- Zlib:
 +  . Fixed bug GH-24533 (zlib.lib could not be found because zlib 1.3.2
 +    CMake build does not emit it). (Lazizbek Ergashev)
 +
 +21 Oct 2026, PHP 8.6.0RC4
 +
 +- Core:
 +  . Fixed GHSA-w8hw-w9fx-j79w, GHSA-6wmf-4rv5-p3rp (Avoid state corruption via
 +    bailout). (CVE-2026-109618, CVE-2026-109619) (Arnaud, ilutov, Jakub Zelenka,
 +    ndossche, Nicolas Grekas)
    . Fixed bug GH-24184 (System ID not being reinitialized after an Apache
      graceful restart, potentially causing incompatible OPcache file cache
      entries to be reused). (Levi Morrison)
diff --cc ext/zip/config.m4
index 590be44f650,d0fbb4d856d..2fd1145da06
--- a/ext/zip/config.m4
+++ b/ext/zip/config.m4
@@@ -4,7 -4,7 +4,7 @@@ PHP_ARG_WITH([zip]
      [Include Zip read/write support])])

  if test "$PHP_ZIP" != "no"; then
-   PKG_CHECK_MODULES([LIBZIP], [libzip >= 1.0.0 libzip != 1.3.1 libzip != 1.7.0])
 -  PKG_CHECK_MODULES([LIBZIP], [libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0 libzip != 1.12 libzip != 1.12.0])
++  PKG_CHECK_MODULES([LIBZIP], [libzip >= 1.0.0 libzip != 1.3.1 libzip != 1.7.0 libzip != 1.12 libzip != 1.12.0])

    PHP_EVAL_INCLINE([$LIBZIP_CFLAGS])
    PHP_EVAL_LIBLINE([$LIBZIP_LIBS], [ZIP_SHARED_LIBADD])