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

144156 Commits

Author SHA1 Message Date
Derick Rethans
043ade6d65 Updated to version 2026.1 (2026a) 2026-03-02 18:17:16 +00:00
Derick Rethans
11e625f765 Empty merge
* PHP-8.4:
  Updated to version 2026.1 (2026a)
  Updated to version 2026.1 (2026a)
2026-03-02 18:17:15 +00:00
Derick Rethans
04897559f0 Updated to version 2026.1 (2026a) 2026-03-02 18:17:14 +00:00
Derick Rethans
9daecc18e0 Empty merge
* PHP-8.3:
  Updated to version 2026.1 (2026a)
2026-03-02 18:17:14 +00:00
Derick Rethans
f437b39060 Updated to version 2026.1 (2026a) 2026-03-02 18:17:13 +00:00
ndossche
fa3c8eed16 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix pcre leak test (#21327)
2026-03-02 18:51:52 +01:00
Nora Dossche
4e831236f8 Fix pcre leak test (#21327)
We need an uninterned string to trigger the leak. The loop is also
unnecessary.
2026-03-02 18:51:29 +01:00
Ilija Tovilo
56d515af6c Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  [skip ci] Reorder lines
2026-03-02 03:38:26 +01:00
Ilija Tovilo
e78f0d149e Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  [skip ci] Reorder lines
2026-03-02 03:38:21 +01:00
Ilija Tovilo
491bf86b09 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [skip ci] Reorder lines
2026-03-02 03:38:17 +01:00
Ilija Tovilo
e140485178 [skip ci] Reorder lines
Makes slightly more sense, even though order is irrelevant.
2026-03-02 03:37:46 +01:00
Ilija Tovilo
1da8ff9da7 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  [CI][skip ci] Fix TEST job failure when no branches changed
2026-03-02 03:35:40 +01:00
Ilija Tovilo
1553242e56 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  [CI][skip ci] Fix TEST job failure when no branches changed
2026-03-02 03:35:34 +01:00
Ilija Tovilo
ecb226c049 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [CI][skip ci] Fix TEST job failure when no branches changed
2026-03-02 03:35:29 +01:00
Ilija Tovilo
53c718c142 [CI][skip ci] Fix TEST job failure when no branches changed 2026-03-02 03:34:34 +01:00
David Carlier
2bbca7c9b9 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  ext/pcntl: add new tests to ver invalid signals handling.
2026-02-28 20:23:00 +00:00
David Carlier
cf9d6f454a ext/pcntl: add new tests to ver invalid signals handling.
from pcntl_sigprocmask(), pcntl_sigwaitinfo(), and pcntl_sigtimedwait().

close GH-21297
2026-02-28 20:21:54 +00:00
ndossche
9200768a55 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  [ci skip] Tweak SKIPIFs
2026-02-28 14:58:02 +01:00
ndossche
cf180f237c [ci skip] Tweak SKIPIFs 2026-02-28 14:57:41 +01:00
ndossche
9248a6c70e Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  bz2: Fix truncation of total output size causing erroneous errors
2026-02-27 23:47:13 +01:00
Niels Dossche
4ee95fc2f3 bz2: Fix truncation of total output size causing erroneous errors
Also switch to uint64_t as that's used on master and makes the code
simpler to fix.

Closes GH-20807.

Co-authored-by: Arnaud Le Blanc <arnaud.lb@gmail.com>
2026-02-27 23:46:48 +01:00
David Carlier
7a8a8633ce Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  ext/pcre: fix mdata_used race conditions in PCRE functions
2026-02-27 22:15:02 +00:00
David Carlier
f8114f554c ext/pcre: fix mdata_used race conditions in PCRE functions
Mirror the mdata_used protection pattern from php_pcre_replace_func_impl
in php_pcre_match_impl, php_pcre_replace_impl, php_pcre_split_impl,
and php_pcre_grep_impl.

close GH-21291
2026-02-27 22:14:41 +00:00
David Carlier
27e12b50f4 ext/pcre: drop negative-length match tests
Newer PCRE2 rejects \K in lookarounds at compile time, so the
negative-length match code path can no longer be triggered from
userland PHP. The PCRE2_EXTRA_ALLOW_LOOKAROUND_BSK flag that would
re-enable it is only settable via the C compile context API.
2026-02-27 19:18:25 +00:00
ndossche
38421684c1 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Fix GH-20906: Assertion failure when messing up output buffers
2026-02-27 18:15:20 +01:00
ndossche
1709689256 Fix GH-20906: Assertion failure when messing up output buffers
Closes GH-20908.
2026-02-27 18:14:56 +01:00
Ilija Tovilo
07e29acbd4 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Add RUN_RESOURCE_HEAVY_TESTS env var
2026-02-27 15:05:21 +01:00
Ilija Tovilo
6f91209260 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Add RUN_RESOURCE_HEAVY_TESTS env var
2026-02-27 15:05:14 +01:00
Ilija Tovilo
c6ad84fb9e Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Add RUN_RESOURCE_HEAVY_TESTS env var
2026-02-27 15:04:24 +01:00
Ilija Tovilo
3a57b4ced5 Add RUN_RESOURCE_HEAVY_TESTS env var
Disable resource-heavy tests by default (>1GB of memory usage), unless the
RUN_RESOURCE_HEAVY_TESTS env variable is set.

Fixes GH-20762
Closes GH-20935
2026-02-27 15:00:35 +01:00
Ilija Tovilo
fbb822f606 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Make one linux job run function jit on push
2026-02-27 14:21:36 +01:00
Ilija Tovilo
e027c66f1f Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Make one linux job run function jit on push
2026-02-27 14:21:10 +01:00
Ilija Tovilo
49c3bee95f Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Make one linux job run function jit on push
2026-02-27 14:20:32 +01:00
Ilija Tovilo
a5a5e3acdd Make one linux job run function jit on push
We're currently only testing the tracing JIT on push. Having at least one
function JIT job will catch some errors earlier.

Closes GH-21294
2026-02-27 14:20:18 +01:00
Ilija Tovilo
7a105ec6b3 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  [CI][skip ci] Fix benchmarking summary
2026-02-27 13:59:39 +01:00
Ilija Tovilo
14427ac18d Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  [CI][skip ci] Fix benchmarking summary
2026-02-27 13:59:04 +01:00
Ilija Tovilo
26a2e3624f Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [CI][skip ci] Fix benchmarking summary
2026-02-27 13:58:53 +01:00
Ilija Tovilo
b2d291546f [CI][skip ci] Fix benchmarking summary
Just compare against github.event.pull_request.base.sha. When GitHub creates
hidden merge commits, it doesn't make sense to compare against the base anyway.

Closes GH-21306
2026-02-27 13:58:17 +01:00
David Carlier
e64e8b0117 ext/pcre: fix new pcre2 test
close GH-21307
2026-02-26 19:47:19 +00:00
David Carlier
5406176050 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  ext/pcre: fix memory leaks on error paths
2026-02-26 18:57:11 +00:00
David Carlier
78702fa470 ext/pcre: fix memory leaks on error paths
Fix pcre2_code leak when pcre2_pattern_info() fails after a successful
pcre2_compile(), and fix match_sets/match_data/marks leak when
offsets[1] < offsets[0] in php_pcre_match_impl().

close GH-21298
2026-02-26 18:56:24 +00:00
Dmitry Stogov
908723ad09 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  Update IR
2026-02-25 17:19:41 +03:00
Dmitry Stogov
f073425426 Update IR
IR commit: d8fbd3b198007f633a255b855cad036758deefb6

Fixes function JIT failures introduced by e792511179
2026-02-25 17:18:25 +03:00
Daniel Scherzer
c2d204b42a Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  php_version.h: remove trailing whitespace
2026-02-24 18:47:07 -05:00
Daniel Scherzer
90cb181844 php_version.h: remove trailing whitespace
Causes the verification of generated files to fail
2026-02-24 18:45:08 -05:00
Calvin Buckley
d7f2ff3aea Merge branch 'PHP-8.4' into PHP-8.5 2026-02-24 17:52:06 -05:00
Calvin Buckley
9942f063db PHP-8.4 is now for PHP 8.4.20-dev 2026-02-24 17:50:02 -05:00
David Carlier
955f82f417 Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
  ext/pcre: preg_match() fix memory leak with invalid regexes.
2026-02-24 22:20:06 +00:00
David Carlier
6c45f7a000 ext/pcre: preg_match() fix memory leak with invalid regexes.
close GH-21290
2026-02-24 22:19:27 +00:00
Daniel Scherzer
022793ee5a Fix missed php_version changes 2026-02-24 11:54:25 -05:00