Fix #80863: ZipArchive::extractTo() ignores references

We need to cater to references, when traversing the files to extract.
While we're at it, we move the `zval_file` declaration into a

Fix #80863: ZipArchive::extractTo() ignores references

We need to cater to references, when traversing the files to extract.
While we're at it, we move the `zval_file` declaration into a narrower
scope.

Closes GH-6959.

show more ...

Fix azure build

This is only needed on ubuntu-18.04, it works fine on ubuntu-20.04.

Add simple Firebird payload fake server to test suite

This is meant to test against certain fixed responses of Firebird
servers. For now we add just a most basic test which verifies a

Add simple Firebird payload fake server to test suite

This is meant to test against certain fixed responses of Firebird
servers. For now we add just a most basic test which verifies a
connection attempt.

Closes GH-6940.

show more ...

Fixed bug #81015

Make sure that the previous opline is part of the same block,
otherwise it may be non-dominating.

The test case does not fail on PHP-7.4, but I think the genera

Fixed bug #81015

Make sure that the previous opline is part of the same block,
otherwise it may be non-dominating.

The test case does not fail on PHP-7.4, but I think the general
problem can appear on 7.4 as well, so I'm applying the patch to
that branch.

show more ...

Add CONFLICTS file for PDO firebird tests

Just in case anybody executes these test in parallel on PHP 7.4.

(cherry picked from commit b4ffe5417440b399c2511a8176179be2f8ef3512)

Add CONFLICTS file for PDO firebird tests

Just in case anybody executes these test in parallel on PHP 7.4.

(cherry picked from commit b4ffe5417440b399c2511a8176179be2f8ef3512)

Closes GH-6943.

show more ...

Update version in php_version.h as well

The version there is automatically updated during `./configure`, but
not on Windows.

Fix #81011: mb_convert_encoding removes references from arrays

We need to dereference references.

Closes GH-6938.

Reset PHP-7.4 for 7.4.20

Fix #79100: Wrong FTP error messages

First we need to properly clear the `inbuf`, what is an amendment to
commit d2881adcbc[1].

Then we need to report `php_pollfd_for_ms()` fail

Fix #79100: Wrong FTP error messages

First we need to properly clear the `inbuf`, what is an amendment to
commit d2881adcbc[1].

Then we need to report `php_pollfd_for_ms()` failures right away; just
setting `errno` does not really help, since at least in some cases it
would have been overwritten before we actually could check it. We use
`php_socket_strerror()` to get a proper error message, and define
`ETIMEDOUT` to the proper value on Windows; otherwise we catch the
definition in errno.h, which is not compatible with WinSock. The
proper solution for this issue would likely be to include something
like ext/sockets/windows_common.h.

Finally, we ensure that we only report warnings using `inbuf`, if it is
not empty.

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

Closes GH-6718.

show more ...

Fix #73246: XMLReader: encoding length not checked

libxml2 expects the passed encoding to be NUL terminated, so we reject
strings with NUL bytes right away.

Closes GH-6899.

Revert "Fix #80892: PDO::PARAM_INT is treated the same as PDO::PARAM_STR"

This reverts commit 340a06778c39054c7d715bceab82175840d92443.

filter_var_array() may return array_of_ref

This function preserves references in the input array.

fetch_assoc may return array_key_long

If the column name is a number (which is possible at least via
AS clauses), then symtable canonicalization will convert it into
an integer key.

password_get_info() may return array_of_null

The algo key is set to null if the algorithm can't be detected.

getdate() may return array_key_long

This function mostly uses string keys, but the timestamp is
returned at key 0 (why???)

Remove incorrect format argument

rc is not used by the printf format.

Fix #80460: ODBC doesn't account for SQL_NO_TOTAL indicator

The `StrLen_or_IndPtr` parameter usually may be `SQL_NO_TOTAL`; we need
to cater to that possibility to avoid working with neg

Fix #80460: ODBC doesn't account for SQL_NO_TOTAL indicator

The `StrLen_or_IndPtr` parameter usually may be `SQL_NO_TOTAL`; we need
to cater to that possibility to avoid working with negative string
lengths and other issues. A noteable exemption are calls to
`SQLGetData()` which return `SQL_SUCCESS`; in that case `SQL_NO_TOTAL`
can not occur.

Closes GH-6809.

show more ...

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Add missing NEWS entry for #80710

Add missing NEWS entry for #80710

Fix build warning

This causes the build to fail on PHP-8.0 and higher.

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Fix #80710: imap_mail_compose() header injection

Fix #80710: imap_mail_compose() header injection

Like `mail()` and `mb_send_mail()`, `imap_mail_compose()` must prevent
header injection. For maximum backward compatibility, we still al

Fix #80710: imap_mail_compose() header injection

Like `mail()` and `mb_send_mail()`, `imap_mail_compose()` must prevent
header injection. For maximum backward compatibility, we still allow
header folding for general headers, and still accept trailing line
breaks for address lists.

show more ...

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Revert "Fix #80852: Stack-overflow when json_encode()'ing SimpleXMLElement"

Revert "Fix #80852: Stack-overflow when json_encode()'ing SimpleXMLElement"

Sorry, this solution seems to have BC breaks, will need to look
for better one.

This reverts commit 9

Revert "Fix #80852: Stack-overflow when json_encode()'ing SimpleXMLElement"

Sorry, this solution seems to have BC breaks, will need to look
for better one.

This reverts commit 9f7e8b777cb3e8aac53e677f3152af18413ab672.

show more ...

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Fix #80852: Stack-overflow when json_encode()'ing SimpleXMLElement