Commit 092fd61bfc0 for php.net
commit 092fd61bfc0c517be1d7db0c92336ed43efb68b3
Merge: 4c8dabf6987 30645401341
Author: “LamentXU123” <108666168+LamentXU123@users.noreply.github.com>
Date: Wed Jun 3 17:08:09 2026 +0800
Merge branch 'PHP-8.4' into PHP-8.5
diff --cc NEWS
index 61bf6d5bcc3,49b61d23696..ae8cf7dbb87
--- a/NEWS
+++ b/NEWS
@@@ -5,12 -5,23 +5,17 @@@ PH
- GD:
. Fixed bug GH-22121 (Double free in gdImageSetStyle() after
overflow-triggered early return). (iliaal)
- . Fixed bug GH-19666 (imageconvolution() unexpected nan filter value).
- (David Carlier)
- . Fixed bug GH-19739 (imageellipse/imagefilledellipse overflow).
- (David Carlier)
- . Fixed bug GH-19730 (imageaffine overflow).
- (David Carlier)
-- Intl:
- . Fix incorrect argument positions for uninitialized calendar arguments in
- IntlCalendar::equals(), ::before(), ::after(), and ::isEquivalentTo().
- (Weilin Du)
+- URI:
+ . Add LEXBOR_STATIC to CFLAGS_URI on Windows so ext/uri does not see
+ LXB_API as __declspec(dllimport) when linked statically into PHP.
+ (Luther Monson)
+ - Phar:
+ . Fixed a bypass of the magic ".phar" directory protection in
+ Phar::addEmptyDir() for paths starting with "/.phar", while allowing
+ non-magic directory names that merely share the ".phar" prefix. (Weilin Du)
+
- Zlib:
. Fixed memory leak if deflate initialization fails and there is a dict.
(ndossche)