Commit 8a7d3bd73a8 for php

commit 8a7d3bd73a88297e54954d4c027dbcf902443fe5
Merge: eab8f9c4fdd 9ea25b50585
Author: Tim Düsterhus <tim@tideways-gmbh.com>
Date:   Tue Nov 3 08:40:39 2026 +0100

    Merge branch 'PHP-8.5' into PHP-8.6

    * PHP-8.5:
      uri: Update to uriparser-1.0.3 (#25145)

diff --cc .github/scripts/download-bundled/uriparser.sh
index 2b8d61a2d56,00000000000..34d4b7fc5de
mode 100755,000000..100755
--- a/.github/scripts/download-bundled/uriparser.sh
+++ b/.github/scripts/download-bundled/uriparser.sh
@@@ -1,24 -1,0 +1,24 @@@
 +#!/bin/sh
 +set -ex
 +cd "$(dirname "$0")/../../.."
 +
 +tmp_dir=/tmp/php-src-download-bundled/uriparser
 +rm -rf "$tmp_dir"
 +
- revision=refs/tags/uriparser-1.0.2
++revision=refs/tags/uriparser-1.0.3
 +
 +git clone --depth 1 --revision="$revision" https://github.com/uriparser/uriparser.git "$tmp_dir"
 +
 +rm -rf ext/uri/uriparser
 +mkdir ext/uri/uriparser
 +cp -R "$tmp_dir"/src ext/uri/uriparser
 +cp -R "$tmp_dir"/include ext/uri/uriparser
 +cp "$tmp_dir"/COPYING.BSD-3-Clause ext/uri/uriparser
 +
 +cd ext/uri/uriparser
 +
 +# move renamed files
 +mv src/UriConfig.h.in src/UriConfig.h
 +
 +# patch customized files
 +git apply -v ../../../.github/scripts/download-bundled/uriparser.config.patch
diff --cc NEWS
index 88207d83bb2,5de475a2252..1fca9d7c889
--- a/NEWS
+++ b/NEWS
@@@ -247,6 -327,15 +247,9 @@@ PH
    . Fix out-of-bounds reads parsing ftp:// wrapper server replies.
      (Alejandro Pacheco)

 -- Tidy:
 -  . Fixed tidy_repair_string(), tidy_repair_file(), tidy::repairString() and
 -    tidy::repairFile() rejecting null for $encoding. (lacatoire)
 -
+ - URI:
 -  . Fixed bug GH-25019 (Uri\Rfc3986\Uri rejects a port with leading zeros as
 -    out of range). (lazerg)
+   . Upgrade to uriparser 1.0.3. (CVE-2026-48841) (Sebastian Pipping, timwolla)
+
  - Windows:
    . Fixed bug GH-25009 (GetConsoleTitleW() buffer size passed in bytes).
      (Lazizbek Ergashev)