Fix broken fix for #80239

No idea why that `git am` failed that badly.

Merge branch 'PHP-8.0' into master

* PHP-8.0:
Fix #80239: imap_rfc822_write_address() leaks memory

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fix #80239: imap_rfc822_write_address() leaks memory

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Fix #80239: imap_rfc822_write_address() leaks memory

Fix #80239: imap_rfc822_write_address() leaks memory

We have to free the address when we're finished with it.

Merge branch 'PHP-8.0' into master

* PHP-8.0:
Fix #64076: imap_sort() does not return FALSE on failure

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fix #64076: imap_sort() does not return FALSE on failure

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Fix #64076: imap_sort() does not return FALSE on failure

Fix #64076: imap_sort() does not return FALSE on failure

If unsupported `$search_criteria` are passed to `imap_sort()`, the
function returns an empty array, but there is also an error on

Fix #64076: imap_sort() does not return FALSE on failure

If unsupported `$search_criteria` are passed to `imap_sort()`, the
function returns an empty array, but there is also an error on the
libc-client error stack ("Unknown search criterion: UNSUPPORTED
(errflg=2)"). If, on the other hand, unsupported `$criteria` or
unsupported `$flags` are passed, the function returns `false`. We
solve this inconsistency by returning `false` for unsupported
`$search_criteria` as well.

Closes GH-6332.

show more ...

Merge branch 'PHP-8.0' into master

* PHP-8.0:
Ignore memory leaks reported for some libc-client functions

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Ignore memory leaks reported for some libc-client functions

Ignore memory leaks reported for some libc-client functions

At least on Windows, some static variables are lazily initialized
during `mail_open()` and `mail_lsub()`, which are reported a

Ignore memory leaks reported for some libc-client functions

At least on Windows, some static variables are lazily initialized
during `mail_open()` and `mail_lsub()`, which are reported as memory
leaks. We suppress these false positives.

Closes GH-6326.

show more ...

Merge branch 'PHP-8.0' into master

* PHP-8.0:
Fix #80226: imap_sort() leaks sortpgm memory

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fix #80226: imap_sort() leaks sortpgm memory

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Fix #80226: imap_sort() leaks sortpgm memory

Fix #80226: imap_sort() leaks sortpgm memory

We need to free what we have allocated.

Closes GH-6327.

Merge branch 'PHP-8.0' into master

* PHP-8.0:
Change parameters types from int to bool

Change parameters types from int to bool

These are typical boolean parameters, so we shouldn't advertize them as
integers. For the `$reverse` parameter that even fixes expectations,

Change parameters types from int to bool

These are typical boolean parameters, so we shouldn't advertize them as
integers. For the `$reverse` parameter that even fixes expectations,
because the `reverse` member is a bitfield of 1 bit, so assigning any
even integer would not set it.

Closes GH-6328.

show more ...

Merge branch 'PHP-8.0' into master

* PHP-8.0:
Fix #80216: imap_mail_compose() does not validate types/encodings

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fix #80216: imap_mail_compose() does not validate types/encodings

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Fix #80216: imap_mail_compose() does not validate types/encodings

Fix #80216: imap_mail_compose() does not validate types/encodings

We need to check whether the given `type`s and `encoding`s are within
bounds to avoid segfaults and out-of-bound reads.

Fix #80216: imap_mail_compose() does not validate types/encodings

We need to check whether the given `type`s and `encoding`s are within
bounds to avoid segfaults and out-of-bound reads.

Closes GH-6323.

show more ...

Merge branch 'PHP-8.0' into master

* PHP-8.0:
Fix #80223: imap_mail_compose() leaks envelope on malformed bodies

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fix #80223: imap_mail_compose() leaks envelope on malformed bodies

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Fix #80223: imap_mail_compose() leaks envelope on malformed bodies