Fix bug #81591: ignore_repeated_errors broken

We should suppress the error if the message is the same, not if
it's different. Apparently we had no test coverage for these
options.

Fixed bug #81582

If __toString() comes from a trait, implement Stringable during
inheritance.

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fix #71316: libpng warning from imagecreatefromstring

Fix #71316: libpng warning from imagecreatefromstring

We backport the respective upstream fix[1] to our bundled libgd.

[1] <https://github.com/libgd/libgd/commit/636100b9280a86e70d8

Fix #71316: libpng warning from imagecreatefromstring

We backport the respective upstream fix[1] to our bundled libgd.

[1] <https://github.com/libgd/libgd/commit/636100b9280a86e70d852d89251fc5492fce33f4>

Closes GH-7615.

show more ...

Fixed bug #81587

iterator_funcs_ptr may be null for Iterators with custom
get_iterator. Ideally MultipleIterator would make use of get_iterator,
but this would require a large implem

Fixed bug #81587

iterator_funcs_ptr may be null for Iterators with custom
get_iterator. Ideally MultipleIterator would make use of get_iterator,
but this would require a large implementation change.

show more ...

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fix Bug #81588 TokyoCabinet driver leaks memory

Fix Bug #81588 TokyoCabinet driver leaks memory

Prepare for 7.4.27

Prep for 8.0.14

[ci skip] Fix typo (Okt → Oct)

Fix bug #81026 (PHP-FPM oob R/W in root process leading to priv escalation)

The main change is to store scoreboard procs directly to the variable sized
array rather than indirectly throu

Fix bug #81026 (PHP-FPM oob R/W in root process leading to priv escalation)

The main change is to store scoreboard procs directly to the variable sized
array rather than indirectly through the pointer.

Signed-off-by: Stanislav Malyshev <stas@php.net>
(cherry picked from commit cb2021e5f69da5e2868130a05bb53db0f9f89e4b)

Closes GH-7614.

show more ...

[ci skip] Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
[ci skip] Fix NEWS

[ci skip] Fix NEWS

Bug #81026 has already been fixed in PHP 7.4.25 and 8.0.12.

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fix #76167: mbstring may use pointer from some previous request

Fix #76167: mbstring may use pointer from some previous request

We must not reuse per-request memory across multiple requests, so this
check triggered during RINIT makes no sense. As ex

Fix #76167: mbstring may use pointer from some previous request

We must not reuse per-request memory across multiple requests, so this
check triggered during RINIT makes no sense. As explained in the bug
report[1], it can be even harmful, if some request startup fails, and
the pointers refer to already freed memory in the next request.

[1] <https://bugs.php.net/76167>

Closes GH-7604.

show more ...

Add FPM fix news

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fix #81500: Interval serialization regression since 7.3.14 / 7.4.2

Fix #81500: Interval serialization regression since 7.3.14 / 7.4.2

While it may not be desired, `DateInterval::$f` supports negative
values, at least with regard to calculations. We sti

Fix #81500: Interval serialization regression since 7.3.14 / 7.4.2

While it may not be desired, `DateInterval::$f` supports negative
values, at least with regard to calculations. We still need to guard
from assigning double values which are out of range for signed 64bit
integers (which would be undefined behavior). zend_dval_to_lval() does
this by returning `0` instead of triggering UB. This way we can avoid
setting the invalid marker, which doesn't work as expected anyway.

We must not do that only for unserialization, but also when the property
is set in the first place.

We need to adapt some of the existing tests wrt. this behavior. In
particular, we check for an arbitrary value in bug79015.phpt, to cater
to differences between 32bit and 64bit architectures.

Closes GH-7575.

show more ...

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fix #81518: Header injection via default_mimetype / default_charset

Fix #81518: Header injection via default_mimetype / default_charset

We forbid setting these INI options to values containing NUL bytes, CR
or LF.

Closes GH-7574.

Fix bug #81521

The current error message is incorrect -- the problem here is not
that the property is invalid, but that these methods are unusable
prior to loading data, same as read

Fix bug #81521

The current error message is incorrect -- the problem here is not
that the property is invalid, but that these methods are unusable
prior to loading data, same as read().

show more ...

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fix #81424: PCRE2 10.35 JIT performance regression

Fix #81424: PCRE2 10.35 JIT performance regression

We backport the respective upstream fix[1] to our bundled pcre2lib plus
the follow-up fix[2] for a functional regression.

[1]

Fix #81424: PCRE2 10.35 JIT performance regression

We backport the respective upstream fix[1] to our bundled pcre2lib plus
the follow-up fix[2] for a functional regression.

[1] <https://github.com/PhilipHazel/pcre2/commit/dc5f96663597572f694147aeec3525003c351123>
[2] <https://github.com/PhilipHazel/pcre2/commit/e7af7efaa11f71b187b0432e9e60f18ba4d90a0c>

Closes GH-7573.

show more ...

[ci skip] Fix NEWS

PHP 8.0.12RC1 has already been tagged a week ago, so later changes
target PHP 8.0.13.

Fixed bug #81494

Use the proper error reporting mechanism rather than throwing a
warning. This requires something of a hack because we don't have
direct access to the connection obje

Fixed bug #81494

Use the proper error reporting mechanism rather than throwing a
warning. This requires something of a hack because we don't have
direct access to the connection object at this point.

show more ...