archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
133332 commits 526 branches 1434 tags 864 MiB
Commit graph

133332 commits

This branch
This branch
All branches
Author SHA1 Message Date
Niels Dossche
55432bfa16 Merge branch 'PHP-8.3' 
* PHP-8.3:
  Fix GH-11956: PCRE regular expressions with JIT enabled gives different result
 2023-09-18 20:15:24 +02:00
Niels Dossche
1bed209363 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-11956: PCRE regular expressions with JIT enabled gives different result
 2023-09-18 20:14:47 +02:00
Niels Dossche
15bbae7bc9 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix GH-11956: PCRE regular expressions with JIT enabled gives different result
 2023-09-18 20:13:45 +02:00
Niels Dossche
d61efdfe97 Fix GH-11956: PCRE regular expressions with JIT enabled gives different result 
The code in the attached test used to work correctly in PHP 8.0, but not
in 8.1+. This is because PHP 8.1+ uses a more modern version of pcre2
than PHP 8.0, and that pcre2 versions has a regression.

While upgrading pcre2lib seems to be only done for the master branch, it
is possible to backport upstream fixes to stable branches. This has been
already done in the past in for JIT regressions [1], so it is not
unprecedented.

We backport the upstream pcre2 fix [2].

[1] 788a701e22
[2] https://github.com/PCRE2Project/pcre2/pull/135

Closes GH-12108.
 2023-09-18 20:11:56 +02:00
David Carlier
f78c8b91eb Merge branch 'PHP-8.3' 2023-09-18 17:47:44 +01:00
David Carlier
639bcb4078 Merge branch 'PHP-8.2' into PHP-8.3 2023-09-18 17:46:28 +01:00
David Carlier
c39d4481c5 Merge branch 'PHP-8.1' into PHP-8.2 2023-09-18 17:46:11 +01:00
Florian Sowade
910f579f14 Fix GH-12207 memory leak of doc blocks of static properties 
When declaring the same static property with a doc block in a class and in a trait,
the doc block of the property in the class is leaked. While at it, possibly fix doc
 comment for internal classes.

Close GH-12238
 2023-09-18 17:44:47 +01:00
George Peter Banyard
bc4807c506
ext/pcntl: Remove useless call to zend_get_callable_name() (#12241) 
Result of it is unused
 2023-09-18 17:35:36 +01:00
Christian Clauss
886bf820c9
[skip ci] Fix typos discovered by codespell (#12228) 2023-09-18 11:07:17 +01:00
George Peter Banyard
42010d42f1
Merge branch 'PHP-8.3' 
* PHP-8.3:
  Fixed oss-fuzz #62294: Unsetting variable after ++/-- on string variable warning
 2023-09-17 15:50:54 +01:00
George Peter Banyard
0b614a6c2b
Fixed oss-fuzz #62294: Unsetting variable after ++/-- on string variable warning 
Closes GH-12202
 2023-09-17 15:49:46 +01:00
Niels Dossche
7f0705b1fa Merge branch 'PHP-8.3' 
* PHP-8.3:
  Fix GH-12208: SimpleXML infinite loop when a cast is used inside a foreach
 2023-09-17 16:35:39 +02:00
Niels Dossche
673babed24 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-12208: SimpleXML infinite loop when a cast is used inside a foreach
 2023-09-17 16:35:11 +02:00
Niels Dossche
f4f34b6e5a Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix GH-12208: SimpleXML infinite loop when a cast is used inside a foreach
 2023-09-17 16:34:38 +02:00
Niels Dossche
486276f0f9 Fix GH-12208: SimpleXML infinite loop when a cast is used inside a foreach 
Closes GH-12229.
 2023-09-17 16:33:32 +02:00
Niels Dossche
8f9626c0f7 Simplify php_sxe_count_elements_helper() by using non-destructive iterator reset 2023-09-17 16:21:54 +02:00
Niels Dossche
fe98a16af7 Add a test case for iterator and empty & var_dump interactions 2023-09-17 16:21:54 +02:00
Niels Dossche
550ec29821 Use php_sxe_reset_iterator_no_clear_iter_data() to avoid having to store and restore iterator data 
This makes the code less error-prone, and also makes it simpler.
 2023-09-17 16:21:54 +02:00
Niels Dossche
695ec3c97e
Remove unnecessary _IS_BOOL case (#12230) 
This can never be executed because booleans are handled in a special
case at the top of sxe_object_cast_ex().
 2023-09-17 16:19:22 +02:00
Christian Clauss
bae30682b8 [ci skip] Update run-tests.php: Fix typo 
Closes GH-12225.
 2023-09-16 21:32:24 +02:00
Niels Dossche
fad0e4f4e7 Merge branch 'PHP-8.3' 
* PHP-8.3:
  Fix GH-12223: Entity reference produces infinite loop in var_dump/print_r
  Fix GH-12192: SimpleXML infinite loop when getName() is called within foreach
  Fix GH-12186: segfault copying/cloning a finalized HashContext
 2023-09-16 21:28:59 +02:00
Niels Dossche
4bb27e2d9b Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-12223: Entity reference produces infinite loop in var_dump/print_r
  Fix GH-12192: SimpleXML infinite loop when getName() is called within foreach
  Fix GH-12186: segfault copying/cloning a finalized HashContext
 2023-09-16 21:28:24 +02:00
Niels Dossche
5df473d2c7 Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix GH-12223: Entity reference produces infinite loop in var_dump/print_r
  Fix GH-12192: SimpleXML infinite loop when getName() is called within foreach
  Fix GH-12186: segfault copying/cloning a finalized HashContext
 2023-09-16 21:24:20 +02:00
Niels Dossche
39a9e561f9 Fix GH-12223: Entity reference produces infinite loop in var_dump/print_r 
Closes GH-12223.
 2023-09-16 21:19:58 +02:00
Niels Dossche
4d888cf53f Fix GH-12192: SimpleXML infinite loop when getName() is called within foreach 
This happens because getName() resets the iterator to the start because
it overwrites the iterator data.
We add a version of get_first_node that does not overwrite the iterator
data.

Closes GH-12193.
 2023-09-16 21:19:28 +02:00
Max Semenik
10f5a06d3c Fix GH-12186: segfault copying/cloning a finalized HashContext 
Closes GH-12186.
Closes GH-12187.
 2023-09-16 21:18:27 +02:00
Niels Dossche
0fee720173 Simplify node check in simplexml 2023-09-16 14:02:48 +02:00
Tim Düsterhus
7c4db150cb
Merge branch 'PHP-8.3' 
* PHP-8.3:
  Fix #[Override] on traits overriding a parent method without a matching interface (#12205)
 2023-09-15 14:57:42 +02:00
Tim Düsterhus
d344fe06a2
Fix #[Override] on traits overriding a parent method without a matching interface (#12205) 
Fixes GH-12189

Co-authored-by: Ilija Tovilo <ilija.tovilo@me.com>
 2023-09-15 14:57:10 +02:00
Ilija Tovilo
7aea6ddec3
Merge branch 'PHP-8.3' 
* PHP-8.3:
  Upgrade to macOS 12 in CI
 2023-09-15 12:06:03 +02:00
Ilija Tovilo
3cd3f06ef6
Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Upgrade to macOS 12 in CI
 2023-09-15 12:05:56 +02:00
Ilija Tovilo
1cf6e12a06
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Upgrade to macOS 12 in CI
 2023-09-15 12:05:47 +02:00
Ilija Tovilo
55ed7690f4
Upgrade to macOS 12 in CI 
We get some mysterious failures on macOS on GA with no evident error. This is a
blind attempt to solve it. There are many similar reports but there's no clear
resolution.

https://github.com/actions/runner-images/issues/7509#issuecomment-1538294874

Closes GH-12210
 2023-09-15 12:04:07 +02:00
Peter Kokot
a8e1b1018d Remove unused --with-zlib-dir configure option 
Commits that removed this option:
- 34dd032e4e
- a2c21e10b2
- e595f5cd8a

Closes GH-12209
 2023-09-14 22:21:54 +02:00
Ilija Tovilo
6349b293e7
Upload callgrind profile to GA (#12212) 2023-09-14 19:52:31 +02:00
Niels Dossche
e5252a3f4d Merge branch 'PHP-8.3' 
* PHP-8.3:
  Fix GH-12170: Can't use xpath with comments in SimpleXML
 2023-09-14 18:45:01 +02:00
Niels Dossche
60b1673b20 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix GH-12170: Can't use xpath with comments in SimpleXML
 2023-09-14 18:44:39 +02:00
Niels Dossche
b3bce2328f Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix GH-12170: Can't use xpath with comments in SimpleXML
 2023-09-14 18:42:47 +02:00
Niels Dossche
747335f100 Fix GH-12170: Can't use xpath with comments in SimpleXML 
Closes GH-12177.
 2023-09-14 18:42:16 +02:00
Tim Düsterhus
b2d244a444
Show the integer size in phpinfo() (#12201) 
Resolves GH-12188
 2023-09-14 14:42:10 +02:00
Ilija Tovilo
9f6cb6baa2
Merge branch 'PHP-8.3' 
* PHP-8.3:
  [skip ci] Fix NEWS entry
 2023-09-14 13:17:54 +02:00
Ilija Tovilo
b15e9b5779
Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  [skip ci] Fix NEWS entry
 2023-09-14 13:17:46 +02:00
Ilija Tovilo
f6a038d16a
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  [skip ci] Fix NEWS entry
 2023-09-14 13:17:26 +02:00
Ilija Tovilo
d0b76d7bdc
[skip ci] Fix NEWS entry 2023-09-14 13:16:43 +02:00
Tim Düsterhus
ede180672b
Merge branch 'PHP-8.3' 
* PHP-8.3:
  Add abstract __construct() test for #[\Override] (024.phpt)
 2023-09-14 12:58:31 +02:00
Tim Düsterhus
0e9d658dd2
Add abstract __construct() test for #[\Override] (024.phpt) 2023-09-14 12:58:08 +02:00
Ilija Tovilo
ddd2bd42ea
Merge branch 'PHP-8.3' 
* PHP-8.3:
  Fix filter_var with callback and explicit REQUIRE_SCALAR
 2023-09-14 11:49:57 +02:00
Ilija Tovilo
b169725757
Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Fix filter_var with callback and explicit REQUIRE_SCALAR
 2023-09-14 11:49:44 +02:00
Ilija Tovilo
85ceb91789
Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  Fix filter_var with callback and explicit REQUIRE_SCALAR
 2023-09-14 11:49:10 +02:00