Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Fix #80215: imap_mail_compose() may modify by-val parameters

Fix #80215: imap_mail_compose() may modify by-val parameters

We separate the input arrays and all sub-arrays to avoid modification
of the passed parameters.

This should be rewri

Fix #80215: imap_mail_compose() may modify by-val parameters

We separate the input arrays and all sub-arrays to avoid modification
of the passed parameters.

This should be rewritten to use `zend_string`s for the "master" branch.

Closes GH-6316.

show more ...

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Fix #80213: imap_mail_compose() segfaults on certain $bodies

Fix #80213: imap_mail_compose() segfaults on certain $bodies

We have to cater to non-associative arrays where the key may be `NULL`;
we just skip these elements.

Closes GH-6315.

Don't specify symfony branch

This was renamed from master to 5.x. Just use the default branch.

Fixed bug #80186

Early exit in FE_RESET if get_properties() returns empty array,
as we cannot add HT iterators to zend_empty_array.

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Make iconv errno support test pass on Solaris.

Make iconv errno support test pass on Solaris.

Closes GH-6291.

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
XFAIL test broken by timelib update

XFAIL test broken by timelib update

I was expecting this to get fixed quickly, but it didn't.
XFAIL for now.

Updated to version 2020.2 (2020b)

Updated to version 2020.2 (2020b)

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Fix too strict imap test expectations

Fix too strict imap test expectations

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Fix #77040: tidyNode::isHtml() is completely broken

Fix #77040: tidyNode::isHtml() is completely broken

The documentation of `tidyNode::isHtml()` states that this method
"checks if a node is part of a HTML document". That is, of course,

Fix #77040: tidyNode::isHtml() is completely broken

The documentation of `tidyNode::isHtml()` states that this method
"checks if a node is part of a HTML document". That is, of course,
nonsense, since a tidyNode is "an HTML node in an HTML file, as
detected by tidy."

What this method is actually supposed to do is to check whether a node
is an element (unless it is the root element). This has been broken by
commit d8eeb8e[1], which assumed that `enum TidyNodeType` would
represent flags of a bitmask, what it does not.

[1] <http://git.php.net/?p=php-src.git;a=commit;h=d8eeb8e28673236bca3f066ded75037a5bdf6378>

Closes GH-6290.

show more ...

Fixed bug #80194

We should strip NOPs from unreachable_free blocks as well, to make
sure that the free really is the first op.

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Fix #80185: jdtounix() fails after 2037

Fix #80185: jdtounix() fails after 2037

There is no such thing as the "end of the unix epoch", and if it was,
it would certainly not be 2037-10-11T02:00:00. There is, however,
poten

Fix #80185: jdtounix() fails after 2037

There is no such thing as the "end of the unix epoch", and if it was,
it would certainly not be 2037-10-11T02:00:00. There is, however,
potential integer overflow which we need to avoid.

Closes GH-6288.

show more ...

Fix bug #80126

When performing an unlinked instanceof, we also need to consider
interfaces of parent classes, as they may not have been inherited
yet.

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Fix #46050: odbc_next_result corrupts prepared resource

Fix #46050: odbc_next_result corrupts prepared resource

When resetting the result's values, we also have to reset its numcols.

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Fix -Wimplicit-function-declaration in configure

Fix -Wimplicit-function-declaration in configure

As this is an error with xcode 12, see bug #80171.

Fix out-of-bounds write

Fixes CVE-2020-26159.

Backported from <https://github.com/kkos/oniguruma/commit/cbe9f8bd9cfc6c3c87a60fbae58fa1a85db59df0>.