Commit b6868563901 for php.net

commit b686856390149cce73dd90f57840c17df0d61913
Merge: 119163a3e2a ebed41a03b8
Author: Weilin Du <weilindu@php.net>
Date:   Fri Jul 10 16:50:49 2026 +0800

    Merge branch 'PHP-8.4' into PHP-8.5

    * PHP-8.4:
      Fix GH-22649: avoid ZipArchive comment reset crash (#22652)

diff --cc NEWS
index f337403fbeb,7aada8213bb..d28381c3902
--- a/NEWS
+++ b/NEWS
@@@ -94,14 -77,17 +94,17 @@@ PH
      segfaults). (iliaal)

  - Standard:
 -  . Fixed bug GH-22360 (convert.base64-encode corruption on
 -    incremental flush). (David Carlier)
    . Fixed bug GH-22395 (base_convert() outputs at most 64 characters).
      (Weilin Du)
 -  . Fixed integer overflow in getimagesize() and getimagesizefromstring()
 -    when parsing an IFF chunk with a size of INT_MAX. (David Carlier, Weilin Du)
 +
 +- URI:
 +  . Fixed behavior of Uri\WhatWg\Url wither methods with regards to empty
 +    opaque hosts. (kocsismate)

  - Zip:
+   . Fixed bug GH-22649 (ZipArchive::setCommentName() and setCommentIndex()
+     could crash after overwriting an entry and resetting its inherited
+     unchanged comment). (Weilin Du)
    . Fixed bug GH-21705 (ZipArchive::getFromIndex() ignores
      ZipArchive::FL_UNCHANGED for deleted entries). (Weilin Du)