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

* PHP-7.4:
[ci skip] Add missing NEWS entry

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

* PHP-7.3:
[ci skip] Add missing NEWS entry

[ci skip] Add missing NEWS entry

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fix #61700: FILTER_FLAG_IPV6/FILTER_FLAG_NO_PRIV|RES_RANGE failing

Fix #61700: FILTER_FLAG_IPV6/FILTER_FLAG_NO_PRIV|RES_RANGE failing

It makes no sense to compare IPv6 address ranges as strings; there are
too many different representation possibilities.

Fix #61700: FILTER_FLAG_IPV6/FILTER_FLAG_NO_PRIV|RES_RANGE failing

It makes no sense to compare IPv6 address ranges as strings; there are
too many different representation possibilities. Instead, we change
`_php_filter_validate_ipv6()` so that it can calculate the IP address
as integer array. We do not rely on `inet_pton()` which may not be
available everywhere, at least IPv6 support may not, but rather parse
the IP address manually. Finally, we compare the integers.

Note that this patch does not fix what we consider as reserved and
private, respectively, but merely tries to keep what we had so far.

Co-authored-by: Nikita Popov <nikita.ppv@gmail.com>

Closes GH-7476.

show more ...

NEWS: Add note for bug #78987

Signed-off-by: Anatol Belski <ab@php.net>

NEWS: Add note for bug #78987

Signed-off-by: Anatol Belski <ab@php.net>

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fix #70962: XML_OPTION_SKIP_WHITE strips embedded whitespace

Fix #70962: XML_OPTION_SKIP_WHITE strips embedded whitespace

We must never strip embedded whitespace; we only need to skip values
when that option is set, and make sure that we keep BC r

Fix #70962: XML_OPTION_SKIP_WHITE strips embedded whitespace

We must never strip embedded whitespace; we only need to skip values
when that option is set, and make sure that we keep BC regarding the
different behavior for "cdata" and "complete" elements (for the former,
the whole element is skipped; for the latter only the "value" key).

We also fix erroneous `int` types which should actually be `size_t`.

Co-authored-by: Christoph M. Becker <cmbecker69@gmx.de>

Closes GH-7493.

show more ...

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fixed bug #79576 ("TYPE *" shows unhelpful message when type is not defined)

Fixed bug #79576 ("TYPE *" shows unhelpful message when type is not defined)

Fix #81435 Observer current_observed_frame may point to an old (overwritten) frame

Ensure current_observed_frame always points to an actually observed frame.
This solution has a caveat o

Fix #81435 Observer current_observed_frame may point to an old (overwritten) frame

Ensure current_observed_frame always points to an actually observed frame.
This solution has a caveat of being O(stack size), with the worst case occurring if there are a lot of frames between the current and previous observed frames.
An O(1) solution would require keeping track of the previous observed frame, which would require some additional frame attached metadata, which is best not attempted in an already released version.

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.

[1] <https://github.com/PhilipHazel/pcre2/commit/dc5f966635975

Fix #81424: PCRE2 10.35 JIT performance regression

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

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

Closes GH-7484.

show more ...

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fix #81433: DOMElement::setIdAttribute() called twice may remove ID

Fix #81433: DOMElement::setIdAttribute() called twice may remove ID

We must only remove the attribute id, if the user requested that.

Closes GH-7482.

The PHP 7.4 branch is for PHP 7.4.25 now

Prep for 8.0.12

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fix #81407: shmop_open won't attach and causes php to crash

Fix #81407: shmop_open won't attach and causes php to crash

We need to allocate buffers for the file mapping names which are large
enough for all potential keys (`key_t` is defined as `i

Fix #81407: shmop_open won't attach and causes php to crash

We need to allocate buffers for the file mapping names which are large
enough for all potential keys (`key_t` is defined as `int` on Windows).

Regarding the test: it's probably never a good idea to use hard-coded
keys (should always use `ftok()` instead), but to reliably reproduce
this Windows specific issue we need to, and it shouldn't be an issue on
that OS.

Closes GH-7448.

show more ...

NEWS + bump zip version

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fix #81400: Unterminated string in dns_get_record() results

Fix #81400: Unterminated string in dns_get_record() results

If we assemble a zend_string manually, we need to end it with a NUL
byte ourselves.

We also fix the size calculation

Fix #81400: Unterminated string in dns_get_record() results

If we assemble a zend_string manually, we need to end it with a NUL
byte ourselves.

We also fix the size calculation for that zend_string; there is no need
for the extra byte for each part, and we don't have to multiply by two,
since we're using DnsQuery_A(), not DnsQuery_W () (in which case we
would have to do the character set conversion, anyway). This avoids
over-allocation, and the need to explicitly set the string length.

Finally, we use the proper access macro for zend_strings.

Closes GH-7427.

show more ...

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fix #53580: During resize gdImageCopyResampled cause colors change

Fix #53580: During resize gdImageCopyResampled cause colors change

We port the upstream fix[1], and also revert commit a3383ac3d7[2] which
is now obsolete, and also not part of libgd. E

Fix #53580: During resize gdImageCopyResampled cause colors change

We port the upstream fix[1], and also revert commit a3383ac3d7[2] which
is now obsolete, and also not part of libgd. Especially the change to
gd.png.c was at best a half-baked optimization.

[1] <https://github.com/libgd/libgd/commit/a24e96f01989bf9ca05a08d33862a08d6f4c4ed6>
[2] <https://github.com/php/php-src/commit/a3383ac3d7e21e54b1d7d89f308088d0692abc9f>

Closes GH-7402.

show more ...