1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Commit Graph

144375 Commits

Author SHA1 Message Date
Niels Dossche
2ef60d07ae Merge branch 'PHP-8.5'
* PHP-8.5:
  Fix GH-20695: Assertion failure in normalize_value() when parsing malformed INI input via parse_ini_string()
2025-12-15 22:47:12 +01:00
Niels Dossche
21fe7149e7 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix GH-20695: Assertion failure in normalize_value() when parsing malformed INI input via parse_ini_string()
2025-12-15 22:47:07 +01:00
Niels Dossche
9cf6f87529 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix GH-20695: Assertion failure in normalize_value() when parsing malformed INI input via parse_ini_string()
2025-12-15 22:46:52 +01:00
Niels Dossche
85cb6e421a Fix GH-20695: Assertion failure in normalize_value() when parsing malformed INI input via parse_ini_string()
I think there's simply a reasoning error about when which scanner state
can cause which parser component to invoke later on.

Closes GH-20702.
2025-12-15 22:46:27 +01:00
Dmitry Stogov
eb88c0a496 Merge branch 'PHP-8.5'
* PHP-8.5:
  Update IR (#20710)
2025-12-15 20:13:40 +03:00
Dmitry Stogov
800c35027e Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Update IR (#20710)
2025-12-15 20:13:24 +03:00
Dmitry Stogov
886729454f Update IR (#20710)
IR commit: 3d72a7295c77743da22b36bab808ebb5f564488d
2025-12-15 20:13:03 +03:00
Arnaud Le Blanc
626f3c3c7c Unify arg info representation for internal and user functions
The arg_info member of zend_function is now always a zend_arg_info*. Before,
it was a zend_internal_arg_info* on internal functions, unless the
ZEND_ACC_USER_ARG_INFO flag was set.

Closes GH-19022
2025-12-15 16:50:49 +01:00
Tim Düsterhus
37d677d594 Merge branch 'PHP-8.5'
* PHP-8.5:
  uri: Update to uriparser-0.9.9-85-g9a31011 (#20707)
2025-12-15 16:20:21 +01:00
Tim Düsterhus
284e202d25 uri: Update to uriparser-0.9.9-85-g9a31011 (#20707)
This is specifically to import uriparser/uriparser#284 to fix CVE-2025-67899.
2025-12-15 16:19:32 +01:00
Niels Dossche
bc79897407 Merge branch 'PHP-8.5'
* PHP-8.5:
  Make bug70417.phpt less flaky
2025-12-15 08:15:17 +01:00
Niels Dossche
03f3da616e Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Make bug70417.phpt less flaky
2025-12-15 08:15:10 +01:00
Niels Dossche
e6f3a9f06f Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Make bug70417.phpt less flaky
2025-12-15 08:15:04 +01:00
Niels Dossche
8ffedc873a Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Make bug70417.phpt less flaky
2025-12-15 08:14:56 +01:00
Niels Dossche
2c4163c90c Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Make bug70417.phpt less flaky
2025-12-15 08:14:48 +01:00
Niels Dossche
2bf2411976 Make bug70417.phpt less flaky
Closes GH-20287.

(cherry picked from commit ed9529a7d3)
2025-12-15 08:14:41 +01:00
Yuya Hamada
42b7fba03f Merge branch 'PHP-8.5' 2025-12-15 11:00:02 +09:00
Yuya Hamada
64dd933a06 Merge branch 'PHP-8.4' into PHP-8.5 2025-12-15 10:58:49 +09:00
Yuya Hamada
355a4b5e61 Merge branch 'PHP-8.3' into PHP-8.4 2025-12-15 10:57:21 +09:00
Yuya Hamada
0056d013bf Fix GH-20674 mb_decode_mimeheader does not handle separator
`?=  =?` is skipped if long term, so skip space character.
Add test case from RFC2047 and fix last pattern
See: https://www.ietf.org/rfc/rfc2047#section-8
2025-12-15 10:55:17 +09:00
Yuya Hamada
85913fc61b Fix GH-20674 mb_decode_mimeheader does not handle separator
`?=  =?` is skipped if long term, so skip space character.
Add test case from RFC2047 and fix last pattern
See: https://www.ietf.org/rfc/rfc2047#section-8
2025-12-15 10:52:03 +09:00
Niels Dossche
683075b77c Merge branch 'PHP-8.5'
* PHP-8.5:
  sapi/fpm: remove use of variable-length arrays (#10645)
2025-12-14 23:31:19 +01:00
Niels Dossche
3a4932785e Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  sapi/fpm: remove use of variable-length arrays (#10645)
2025-12-14 23:31:12 +01:00
Niels Dossche
6a20ef9cdb Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  sapi/fpm: remove use of variable-length arrays (#10645)
2025-12-14 23:31:06 +01:00
Niels Dossche
802ad3c6a4 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  sapi/fpm: remove use of variable-length arrays (#10645)
2025-12-14 23:31:00 +01:00
Niels Dossche
4d28e2af9e Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  sapi/fpm: remove use of variable-length arrays (#10645)
2025-12-14 23:30:54 +01:00
Max Kellermann
5850c7de7c sapi/fpm: remove use of variable-length arrays (#10645)
According to @cmb69, PHP does not require VLA support
(https://github.com/php/php-src/pull/10304#discussion_r1069343092).
VLAs are a bad idea for several reasons, so let's get rid of them.

Two of the VLAs were probably unintended; unlike C++, C doesn't have
the concept of "constant expressions", so an array with a "const"
length is technically still a VLA.  This is fixed by removing the
"const" variable, and using sizeof() instead.

(cherry picked from commit ff2a211d55)
2025-12-14 23:30:37 +01:00
Niels Dossche
ec337122d5 Merge branch 'PHP-8.5'
* PHP-8.5:
  Fix GH-20699: SQLite3Result fetchArray return array|false, null returned
2025-12-14 23:18:21 +01:00
Niels Dossche
0ef52c3d89 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix GH-20699: SQLite3Result fetchArray return array|false, null returned
2025-12-14 23:18:16 +01:00
Niels Dossche
f3d5dd0feb Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix GH-20699: SQLite3Result fetchArray return array|false, null returned
2025-12-14 23:17:58 +01:00
Niels Dossche
acd0898bdf Fix GH-20699: SQLite3Result fetchArray return array|false, null returned
Closes GH-20701.
2025-12-14 23:17:31 +01:00
David Carlier
ae59c69467 ext/spl: DirectoryIterator to support modern filesytems.
With filesystems with builtin large capacity such as ZFS, Btfrs, NTFS
 or even ext4 with large_dir feature enabled, an int to represent an
entry index is falling short, thus risking overflows.

A zend_long however should cover this need without  increasing out
internal data structure.

close GH-20705
2025-12-14 22:01:02 +00:00
Kamil Tekiela
3de6dd12b6 Merge branch 'PHP-8.5'
* PHP-8.5:
  Squashed commit of the following:
2025-12-14 15:29:58 +00:00
Kamil Tekiela
c566502d9e Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Squashed commit of the following:
2025-12-14 15:29:02 +00:00
Kamil Tekiela
c54abaa7e4 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Squashed commit of the following:
2025-12-14 15:28:01 +00:00
Kamil Tekiela
dbf56e0eba Squashed commit of the following:
commit c4adcbe582
Author: Kamil Tekiela <tekiela246@gmail.com>
Date:   Fri Oct 17 15:32:14 2025 +0100

    Add NEWS

commit 84a6e675af
Author: Kamil Tekiela <tekiela246@gmail.com>
Date:   Fri Oct 17 14:49:26 2025 +0100

    Handle errors in mysqli_begin_transaction
2025-12-14 15:25:34 +00:00
Niels Dossche
1f648c3118 Merge branch 'PHP-8.5'
* PHP-8.5:
  Fix test for 8.5+
2025-12-14 13:35:08 +01:00
Niels Dossche
526938648e Fix test for 8.5+ 2025-12-14 13:35:03 +01:00
David Carlier
b8ee9bb032 Merge branch 'PHP-8.5'
* PHP-8.5:
  Fix GH-20678: resource created by GlobIterator crashes with fclose().
2025-12-14 11:59:24 +00:00
David Carlier
4d680fa1e2 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix GH-20678: resource created by GlobIterator crashes with fclose().
2025-12-14 11:59:14 +00:00
David Carlier
90475249dd Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix GH-20678: resource created by GlobIterator crashes with fclose().
2025-12-14 11:58:41 +00:00
David Carlier
97a90f4361 Fix GH-20678: resource created by GlobIterator crashes with fclose().
close GH-20697
2025-12-14 11:58:18 +00:00
Ilija Tovilo
8ab11e77e8 Merge branch 'PHP-8.5'
* PHP-8.5:
  Fix xcode-select
2025-12-13 20:30:18 +01:00
Ilija Tovilo
d28b13c8d9 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix xcode-select
2025-12-13 20:30:14 +01:00
Ilija Tovilo
e82afcfc1b Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix xcode-select
2025-12-13 20:30:09 +01:00
Ilija Tovilo
b37a6e73b1 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Fix xcode-select
2025-12-13 20:30:03 +01:00
Ilija Tovilo
9bd587801d Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix xcode-select
2025-12-13 20:29:56 +01:00
Ilija Tovilo
6cdb8bf0a2 Fix xcode-select
The old Xcode sticks around, so make sure we sort in reverse to pick the newer
version. Technically we should use something like sort -Vr, but -V doesn't exist
on macOS. But that won't be a problem until Xcode 100, which my great great
grand children can worry about.
2025-12-13 20:27:14 +01:00
Niels Dossche
c9008f6dd8 Make buildFromIterator() work with custom SplFileInfo objects
While it is possible to return a custom SplFileInfo object in the
iterator used by buildFromIterator(), the data is not actually used from
that object, instead the data from the underlying internal structure is
used. This makes it impossible to override some metadata such as the
path name and modification time.

The main motivation comes from two reasons:
- Consistency. We expect our custom methods to be called when having a
  custom object.
- Support reproducibility. This is the original use case as requested in
  [1].

Add support for this by calling the getMTime() and getPathname() methods
if they're overriden by a user class.

[1] https://github.com/theseer/Autoload/issues/114.
2025-12-13 05:28:33 -08:00
Niels Dossche
521c0c5cd2 Refactor path name processing in phar_build() 2025-12-13 05:28:33 -08:00