Skip to content

Commit f368a31

Browse files
committed
Merge remote-tracking branch 'origin/master' into disable_deepbind_use_dlmopen
2 parents c527785 + f129586 commit f368a31

File tree

907 files changed

+538082
-193627
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

907 files changed

+538082
-193627
lines changed

.gitattributes

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,5 @@
3030
/ext/date/tests/ossfuzz*.txt binary
3131

3232
# Vendored libraries
33-
/ext/dom/lexbor/lexbor linguist-vendored
33+
/ext/lexbor/lexbor linguist-vendored
34+
/ext/uri/uriparser linguist-vendored

.github/CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
/ext/gmp @Girgias
2828
/ext/intl @devnexen
2929
/ext/json @bukka
30+
/ext/lexbor @kocsismate @nielsdos
3031
/ext/libxml @nielsdos
3132
/ext/mbstring @alexdowad @youkidearitai
3233
/ext/mysqli @bukka @kamil-tekiela
@@ -51,6 +52,7 @@
5152
/ext/sockets @devnexen
5253
/ext/spl @Girgias
5354
/ext/standard @bukka
55+
/ext/uri @kocsismate
5456
/ext/xml @nielsdos
5557
/ext/xmlreader @nielsdos
5658
/ext/xmlwriter @nielsdos

.github/labeler.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,11 @@
320320
- any-glob-to-any-file:
321321
- ext/tokenizer/**/*
322322

323+
"Extension: uri":
324+
- changed-files:
325+
- any-glob-to-any-file:
326+
- ext/uri/**/*
327+
323328
"Extension: xml":
324329
- changed-files:
325330
- any-glob-to-any-file:

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,6 @@ tmp-php.ini
306306
!/ext/fileinfo/libmagic/config.h
307307
!/ext/fileinfo/libmagic.patch
308308
!/ext/fileinfo/magicdata.patch
309-
!/ext/dom/lexbor/patches/*.patch
309+
!/ext/lexbor/patches/*.patch
310310
!/ext/pcre/pcre2lib/config.h
311311
!/win32/build/Makefile

EXTENSIONS

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -170,56 +170,63 @@ EXTENSION: dom
170170
PRIMARY MAINTAINER: Christian Stocker <[email protected]> (2003 - 2011)
171171
Rob Richards <[email protected]> (2003 - 2012)
172172
Marcus Börger <[email protected]> (2003 - 2006)
173-
Niels Dossche <[email protected]> (2023 - 2024)
173+
Niels Dossche <[email protected]> (2023 - 2025)
174174
MAINTENANCE: Maintained
175175
STATUS: Working
176176
SINCE: 5.0
177177
-------------------------------------------------------------------------------
178178
EXTENSION: simplexml
179179
PRIMARY MAINTAINER: Marcus Börger <[email protected]> (2003 - 2008)
180-
Niels Dossche <[email protected]> (2023 - 2024)
180+
Niels Dossche <[email protected]> (2023 - 2025)
181181
MAINTENANCE: Maintained
182182
STATUS: Working
183183
SINCE: 5.0
184184
-------------------------------------------------------------------------------
185185
EXTENSION: soap
186186
PRIMARY MAINTAINER: Dmitry Stogov <[email protected]> (2004 - 2018)
187-
Niels Dossche <[email protected]> (2024 - 2024)
187+
Niels Dossche <[email protected]> (2024 - 2025)
188188
MAINTENANCE: Odd fixes
189189
STATUS: Working
190190
-------------------------------------------------------------------------------
191191
EXTENSION: xml
192192
PRIMARY MAINTAINER: Thies C. Arntzen <[email protected]> (1999 - 2002)
193193
Rob Richards <[email protected]> (2003 - 2013)
194-
Niels Dossche <[email protected]> (2023 - 2024)
194+
Niels Dossche <[email protected]> (2023 - 2025)
195195
MAINTENANCE: Maintained
196196
STATUS: Working
197197
-------------------------------------------------------------------------------
198+
EXTENSION: lexbor
199+
PRIMARY MAINTAINER: Niels Dossche <[email protected]> (2023 - 2025)
200+
Mate Kocsis <[email protected]> (2025 - 2025)
201+
MAINTENANCE: Maintained
202+
STATUS: Working
203+
SINCE: 8.5
204+
-------------------------------------------------------------------------------
198205
EXTENSION: libxml
199206
PRIMARY MAINTAINER: Rob Richards <[email protected]> (2003 - 2009)
200207
Christian Stocker <[email protected]> (2004 - 2011)
201-
Niels Dossche <[email protected]> (2023 - 2024)
208+
Niels Dossche <[email protected]> (2023 - 2025)
202209
MAINTENANCE: Maintained
203210
STATUS: Working
204211
-------------------------------------------------------------------------------
205212
EXTENSION: xmlreader
206213
PRIMARY MAINTAINER: Rob Richards <[email protected]> (2004 - 2010)
207214
Christian Stocker <[email protected]> (2004 - 2004)
208-
Niels Dossche <[email protected]> (2023 - 2024)
215+
Niels Dossche <[email protected]> (2023 - 2025)
209216
MAINTENANCE: Maintained
210217
STATUS: Working
211218
-------------------------------------------------------------------------------
212219
EXTENSION: xmlwriter
213220
PRIMARY MAINTAINER: Rob Richards <[email protected]> (2004 - 2010)
214221
Pierre-Alain Joye <[email protected]> (2005-2009)
215-
Niels Dossche <[email protected]> (2023 - 2024)
222+
Niels Dossche <[email protected]> (2023 - 2025)
216223
MAINTENANCE: Maintained
217224
STATUS: Working
218225
-------------------------------------------------------------------------------
219226
EXTENSION: xsl
220227
PRIMARY MAINTAINER: Christian Stocker <[email protected]> (2003 - 2011)
221228
Rob Richards <[email protected]> (2003 - 2010)
222-
Niels Dossche <[email protected]> (2023 - 2024)
229+
Niels Dossche <[email protected]> (2023 - 2025)
223230
MAINTENANCE: Maintained
224231
STATUS: Working
225232
SINCE: 5.0
@@ -496,6 +503,12 @@ PRIMARY MAINTAINER: Andrei Zmievski <[email protected]> (2002 - 2002)
496503
MAINTENANCE: Maintained
497504
STATUS: Working
498505
-------------------------------------------------------------------------------
506+
EXTENSION: uri
507+
PRIMARY MAINTAINER Máté Kocsis <[email protected]> (2025 - 2025)
508+
MAINTENANCE: Maintained
509+
STATUS: Working
510+
SINCE: 8.5.0
511+
-------------------------------------------------------------------------------
499512
EXTENSION: zip
500513
PRIMARY MAINTAINER: Pierre-Alain Joye <[email protected]> (2006 - 2011)
501514
Remi Collet <[email protected]> (2013-2020)

NEWS

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,13 @@ PHP NEWS
4949
. Added get_error_handler(), get_exception_handler() functions. (Arnaud)
5050
. Fixed bug GH-15753 and GH-16198 (Bind traits before parent class). (ilutov)
5151
. Added support for casts in constant expressions. (nielsdos)
52+
. Fixed bugs GH-17711 and GH-18022 (Infinite recursion on deprecated attribute
53+
evaluation) and GH-18464 (Recursion protection for deprecation constants not
54+
released on bailout). (DanielEScherzer and ilutov)
55+
. Fixed AST printing for immediately invoked Closure. (Dmitrii Derepko)
56+
. Properly handle __debugInfo() returning an array reference. (nielsdos)
57+
. Properly handle reference return value from __toString(). (nielsdos)
58+
. Added the pipe (|>) operator. (crell)
5259

5360
- Curl:
5461
. Added curl_multi_get_handles(). (timwolla)
@@ -67,6 +74,7 @@ PHP NEWS
6774
- Enchant:
6875
. Added enchant_dict_remove_from_session(). (nielsdos)
6976
. Added enchant_dict_remove(). (nielsdos)
77+
. Fix missing empty string checks. (nielsdos)
7078

7179
- EXIF:
7280
. Add OffsetTime* Exif tags. (acc987)
@@ -96,6 +104,13 @@ PHP NEWS
96104
. Added grapheme_levenshtein() function. (Yuya Hamada)
97105
. Added Locale::addLikelySubtags/Locale::minimizeSubtags to handle
98106
adding/removing likely subtags to a locale. (David Carlier)
107+
. Added IntlListFormatter class to format a list of items with a locale
108+
, operands types and units. (BogdanUngureanu)
109+
. Fixed bug GH-18566 ([intl] Weird numeric sort in Collator). (nielsdos)
110+
111+
- LDAP:
112+
. Allow ldap_get_option to retrieve global option by allowing NULL for
113+
connection instance ($ldap). (Remi)
99114

100115
- MySQLi:
101116
. Fixed bugs GH-17900 and GH-8084 (calling mysqli::__construct twice).
@@ -105,9 +120,12 @@ PHP NEWS
105120
. Added mysqlnd.collect_memory_statistics to ini quick reference.
106121
(hauk92)
107122

108-
- OPcache:
123+
- Opcache:
109124
. Fixed ZTS OPcache build on Cygwin. (cmb)
110125
. Added opcache.file_cache_read_only. (Samuel Melrose)
126+
. Updated default value of opcache.jit_hot_loop. (Arnaud)
127+
. Log a warning when opcache lock file permissions could not be changed.
128+
(Taavi Eomäe)
111129

112130
- Output:
113131
. Fixed calculation of aligned buffer size. (cmb)
@@ -126,6 +144,13 @@ PHP NEWS
126144
- PDO_SQLITE:
127145
. throw on null bytes / resolve GH-13952 (divinity76).
128146
. Implement GH-17321: Add setAuthorizer to Pdo\Sqlite. (nielsdos)
147+
. PDO::sqliteCreateCollation now throws a TypeError if the callback
148+
has a wrong return type. (David Carlier)
149+
. Added Pdo_Sqlite::ATTR_BUSY_STATEMENT constant to check
150+
if a statement is currently executing. (David Carlier)
151+
. Added Pdo_Sqlite::ATTR_EXPLAIN_STATEMENT constant to set a statement
152+
in either EXPLAIN_MODE_PREPARED, EXPLAIN_MODE_EXPLAIN,
153+
EXPLAIN_MODE_EXPLAIN_QUERY_PLAN modes. (David Carlier)
129154

130155
- PGSQL:
131156
. Added pg_close_stmt to close a prepared statement while allowing
@@ -172,6 +197,11 @@ PHP NEWS
172197
- SOAP:
173198
. Fixed bug #49169 (SoapServer calls wrong function, although "SOAP action"
174199
header is correct). (nielsdos)
200+
. Fix namespace handling of WSDL and XML schema in SOAP,
201+
fixing at least GH-16320 and bug #68576. (nielsdos)
202+
. Fixed bug #70951 (Segmentation fault on invalid WSDL cache). (nielsdos)
203+
. Implement request #55503 (Extend __getTypes to support enumerations).
204+
(nielsdos, datibbaw)
175205

176206
- Sockets:
177207
. Added IPPROTO_ICMP/IPPROTO_ICMPV6 to create raw socket for ICMP usage.
@@ -201,16 +231,27 @@ PHP NEWS
201231
(David Carlier)
202232
. Added IP_BINDANY for a socket to bind to any address. (David Carlier)
203233
. Added SO_BUSY_POOL to reduce packets poll latency. (David Carlier)
234+
- Added UDP_SEGMENT support to optimise multiple large datagrams over UDP
235+
if the kernel and hardware supports it. (David Carlier)
236+
- Added SHUT_RD, SHUT_WR and SHUT_RDWR constants for socket_shutdown().
237+
(David Carlier)
204238

205239
- Sodium:
206240
. Fix overall theorical overflows on zend_string buffer allocations.
207241
(David Carlier/nielsdos)
208242

243+
- Sqlite:
244+
. Added Sqlite3Stmt::busy to check if a statement is still being executed.
245+
(David Carlier)
246+
209247
- Standard:
210248
. Fixed crypt() tests on musl when using --with-external-libcrypt
211249
(Michael Orlitzky).
212250
. Fixed bug GH-18062 (is_callable(func(...), callable_name: $name) for first
213251
class callables returns wrong name). (timwolla)
252+
. Added array_first() and array_last(). (nielsdos)
253+
. Fixed bug GH-18823 (setlocale's 2nd and 3rd argument ignores strict_types).
254+
(nielsdos)
214255

215256
- Streams:
216257
. Fixed bug GH-16889 (stream_select() timeout useless for pipes on Windows).
@@ -219,6 +260,10 @@ PHP NEWS
219260
- Tests:
220261
. Allow to shuffle tests even in non-parallell mode. (dhuang00)
221262

263+
- Tidy:
264+
. tidy::__construct/parseFile/parseString methods throw an exception if
265+
the configuration argument is invalid. (David Carlier)
266+
222267
- Windows:
223268
. Fixed bug GH-10992 (Improper long path support for relative paths). (cmb,
224269
nielsdos)

README.REDIST.BINS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
17. ext/mbstring/ucgendat portions based on the ucgendat.c from the OpenLDAP
1818
18. avifinfo (ext/standard/libavifinfo) see ext/standard/libavifinfo/LICENSE
1919
19. xxHash (ext/hash/xxhash)
20-
20. Lexbor (ext/dom/lexbor/lexbor) see ext/dom/lexbor/LICENSE
20+
20. Lexbor (ext/lexbor/lexbor) see ext/lexbor/LICENSE
2121
21. Portions of libcperciva (ext/hash/hash_sha_{ni,sse2}.c) see the header in the source file
22+
22. uriparser (ext/uri/uriparser) see ext/uri/uriparser/COPYING
2223

2324
3. pcre2lib (ext/pcre)
2425

0 commit comments

Comments
 (0)