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

144722 Commits

Author SHA1 Message Date
Bob Weinand
ff5cecd765 Merge branch 'PHP-8.5'
* PHP-8.5:
  Regenerate VM after merge
2026-01-15 17:45:46 +01:00
Bob Weinand
82e2055300 Regenerate VM after merge
Signed-off-by: Bob Weinand <bobwei9@hotmail.com>
2026-01-15 17:45:26 +01:00
Bob Weinand
b95d2ee70a Merge branch 'PHP-8.5'
* PHP-8.5:
  Split the live-ranges of loop variables again (#20865)
2026-01-15 16:17:34 +01:00
Bob Weinand
c878380065 Merge branch 'PHP-8.4' of github.com:php/php-src into PHP-8.5
* 'PHP-8.4' of github.com:php/php-src:
  Split the live-ranges of loop variables again (#20865)
2026-01-15 16:15:29 +01:00
Bob Weinand
27ed48c0be Split the live-ranges of loop variables again (#20865)
* Fix use-after-free in FE_FREE with GC interaction

When FE_FREE with ZEND_FREE_ON_RETURN frees the loop variable during
an early return from a foreach loop, the live range for the loop
variable was incorrectly extending past the FE_FREE to the normal
loop end. This caused GC to access the already-freed loop variable
when it ran after the RETURN opcode, resulting in use-after-free.

Fix by splitting the ZEND_LIVE_LOOP range when an FE_FREE with
ZEND_FREE_ON_RETURN is encountered:
- One range covers the early return path up to the FE_FREE
- A separate range covers the normal loop end FE_FREE
- Multiple early returns create multiple separate ranges

* Split the live-ranges of loop variables again

b0af9ac733 removed the live-range splitting of foreach variables, however it only added handling to ZEND_HANDLE_EXCEPTION.
This was sort-of elegant, until it was realized in 8258b7731b that it would leak the return variable, requiring some more special handling.
At some point we added live tmpvar rooting in 52cf7ab8a2, but this did not take into account already freed loop variables, which also might happen during ZEND_RETURN, which cannot be trivially accounted for, without even more complicated handling in zend_gc_*_tmpvars() functions.

This commit also proposes a simpler way of tracking the loop end in loopvar freeing ops: handle it directly during live range computation rather than during compilation, eliminating the need for opcache to handle it specifically.
Further, opcache was using live_ranges in its basic block computation in the past, which it no longer does. Thus this complication is no longer necessary and this approach should be actually simpler now.

Closes #20766.

Signed-off-by: Bob Weinand <bobwei9@hotmail.com>

---------

Signed-off-by: Bob Weinand <bobwei9@hotmail.com>
Co-authored-by: Gustavo Lopes <mail@geleia.net>
2026-01-15 16:13:43 +01:00
Máté Kocsis
d136b214d1 Fix the real time benchmark artifact glob pattern
[skip-ci]
2026-01-15 10:54:07 +01:00
Máté Kocsis
02159c16b5 Do not measure instruction count by default on the scheduled runs
It makes the benchmark faster to execute. And this metric is not that useful anyway.

[skip-ci]
2026-01-15 10:54:07 +01:00
Steve Wall
c1d2875a82 Implement GH-20310: No critical extension indication in openssl_x509_parse() output
This add criticalExtensions field to openssl_x509_parse() output that
provides name of all critical extensions.

Closes #20310
Closes #20311
2026-01-14 22:59:10 +01:00
Alexandre Daubois
b391c28f90 Merge branch 'PHP-8.5'
* PHP-8.5:
  Fix GH-20836: Stack overflow in mb_convert_variables with recursive array references (#20839)
2026-01-14 20:11:31 +01:00
Alexandre Daubois
32803687fe Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix GH-20836: Stack overflow in mb_convert_variables with recursive array references (#20839)
2026-01-14 20:10:30 +01:00
Alexandre Daubois
2c112e3696 Fix GH-20836: Stack overflow in mb_convert_variables with recursive array references (#20839) 2026-01-14 20:07:11 +01:00
Máté Kocsis
3d418eb35b Remove the opcache option from the real-time benchmark workflow
It's not needed anymore since it's now always turned on, and the exact usage (whether to use --enable-opcache or not) is automatically detected: 0b116647c7

[skip-ci]
2026-01-14 18:21:50 +01:00
Jordi Kroon
a7abaa012b always add PHP_MANDIR if exists (#20825) 2026-01-14 15:54:53 +01:00
Derick Rethans
16ca3531cf Merge branch 'PHP-8.5'
* PHP-8.5:
  Update generated parser file
2026-01-14 14:22:19 +00:00
Derick Rethans
695df88fbf Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Update generated parser file
2026-01-14 14:22:06 +00:00
Derick Rethans
c929f2aa87 Update generated parser file 2026-01-14 14:21:29 +00:00
Derick Rethans
21aaa1dba2 Merge branch 'PHP-8.5' 2026-01-14 14:19:08 +00:00
Derick Rethans
128530455b Merge branch 'PHP-8.4' into PHP-8.5 2026-01-14 14:18:56 +00:00
Derick Rethans
151e001109 Merge branch 'PHP-8.3' into PHP-8.4 2026-01-14 14:18:36 +00:00
Derick Rethans
ba1f3d9a87 Revert "Updated to version 2025.3 (2025c)"
This reverts commit 2670c8646d.
2026-01-14 14:16:47 +00:00
Derick Rethans
cfbfc1b6f6 Revert "Upgrade timelib to 2022.16"
This reverts commit e208cd86b4.
2026-01-14 14:16:40 +00:00
Derick Rethans
0bdfaf308b Merge branch 'PHP-8.5'
* PHP-8.5:
  Upgrade timelib to 2022.16
  Updated to version 2025.3 (2025c)
2026-01-14 14:13:33 +00:00
Derick Rethans
cdeb0694f4 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Upgrade timelib to 2022.16
2026-01-14 14:12:15 +00:00
Derick Rethans
9d4a1f0c7e Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Upgrade timelib to 2022.16
2026-01-14 14:11:29 +00:00
Derick Rethans
e208cd86b4 Upgrade timelib to 2022.16 2026-01-14 14:10:44 +00:00
Derick Rethans
45978c183e Updated to version 2025.3 (2025c) 2026-01-14 13:55:18 +00:00
Derick Rethans
38986a9c1f Empty merge
* PHP-8.4:
  Updated to version 2025.3 (2025c)
  Updated to version 2025.3 (2025c)
2026-01-14 13:55:18 +00:00
Derick Rethans
771dbda6fb Updated to version 2025.3 (2025c) 2026-01-14 13:55:17 +00:00
Derick Rethans
f1ed1e1d87 Empty merge
* PHP-8.4:
  Updated to version 2025.3 (2025c)
  Updated to version 2025.3 (2025c)
2026-01-14 13:55:17 +00:00
Derick Rethans
65e316e89c Updated to version 2025.3 (2025c) 2026-01-14 13:55:15 +00:00
Derick Rethans
c42eedc088 Empty merge
* PHP-8.3:
  Updated to version 2025.3 (2025c)
2026-01-14 13:55:14 +00:00
Derick Rethans
2670c8646d Updated to version 2025.3 (2025c) 2026-01-14 13:55:08 +00:00
Máté Kocsis
c65adbaed0 Various improvements for the Real time benchmark (#20930)
- Ubuntu is updated to 24.04
- Log files are also uploaded as artifact
- The baseline commit is now correctly set to the merge base commit when the workflow is manually started on a PR
2026-01-14 08:41:38 +01:00
Máté Kocsis
858d34fd32 Merge branch 'PHP-8.5'
* PHP-8.5:
  Reorganize ext/uri tests - equivalence (#20391)
2026-01-13 22:46:22 +01:00
Máté Kocsis
48344c9f86 Reorganize ext/uri tests - equivalence (#20391) 2026-01-13 22:45:58 +01:00
Niels Dossche
d86182f7ef date: Avoid passing objects using double pointers
Using single pointers is cleaner and also generates better machine code.
2026-01-13 18:53:43 +01:00
Niels Dossche
3c654a8574 date: Remove unused argument for internal functions 2026-01-13 18:53:43 +01:00
Ilija Tovilo
ba581b931a [skip ci] Use ubuntu-latest for docs
No need to keep bumping this build if breakage is unlikely.

Closes GH-20926
2026-01-13 16:16:57 +01:00
Ilija Tovilo
4a0304f321 Merge branch 'PHP-8.5'
* PHP-8.5:
  [skip ci] Upgrade to Ubuntu 24.04 for PECL and coverage builds
2026-01-13 16:11:03 +01:00
Ilija Tovilo
07ab0302a0 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  [skip ci] Upgrade to Ubuntu 24.04 for PECL and coverage builds
2026-01-13 16:10:58 +01:00
Ilija Tovilo
688d4e7072 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  [skip ci] Upgrade to Ubuntu 24.04 for PECL and coverage builds
2026-01-13 16:10:53 +01:00
Ilija Tovilo
c145f83f34 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [skip ci] Upgrade to Ubuntu 24.04 for PECL and coverage builds
2026-01-13 16:10:47 +01:00
Ilija Tovilo
648ad5be31 [skip ci] Upgrade to Ubuntu 24.04 for PECL and coverage builds 2026-01-13 16:10:35 +01:00
Tim Düsterhus
175b7bca8c Merge branch 'PHP-8.5'
* PHP-8.5:
  zend_language_parser: Backup / restore doc comment when parsing attributes (#20896)
2026-01-13 16:08:15 +01:00
Tim Düsterhus
11ae6ad0be zend_language_parser: Backup / restore doc comment when parsing attributes (#20896)
Attributes may themselves contain elements which can have a doc comment on
their own (namely Closures). A doc comment before the attribute list is
generally understood as belonging to the symbol having the attributes.

Fixes php/php-src#20895.
2026-01-13 16:07:50 +01:00
Ilija Tovilo
bf4f8f5c9c Upgrade to mssql 2025
Closes GH-20924
2026-01-13 15:48:11 +01:00
Tim Düsterhus
51f7c634ac Merge branch 'PHP-8.5'
* PHP-8.5:
  [skip ci] Fix typo in NEWS
2026-01-13 15:22:48 +01:00
Tim Düsterhus
b757a5c73b [skip ci] Fix typo in NEWS 2026-01-13 15:22:29 +01:00
Ilija Tovilo
ab1f34b3de Upgrade Circle CI build to Ubuntu 24.04
Closes GH-20923
2026-01-13 14:43:59 +01:00
Ilija Tovilo
1075182118 Fix "fptr may be used uninitialized" warning
Older versions of GCC seem to get confused about the call to
zend_ast_call_get_args(ast), and assume it may mutate ast, even though it is
local.
2026-01-13 13:15:31 +01:00