1
0
mirror of https://github.com/php/php-src.git synced 2026-04-28 02:33:17 +02:00
Commit Graph

121330 Commits

Author SHA1 Message Date
Alex Dowad 7bb5b435af mUTF-7 (UTF7-IMAP) conversion: handle illegal (non-RFC-compliant) input correctly
Instead of looking the other way and letting things slide, report errors when
the input does not follow the RFC.
2020-10-13 20:26:14 +02:00
Alex Dowad b43a7deacf Add 'mUTF-7' alias for UTF7-IMAP encoding 2020-10-13 20:26:14 +02:00
Alex Dowad b975817265 Add comment explaining mUTF-7 to mbfilter_utf7imap.c 2020-10-13 20:26:14 +02:00
Alex Dowad 648c1cb51e Add identify filter for UCS-2, UCS-2BE, and UCS-2LE encodings 2020-10-13 20:26:14 +02:00
Alex Dowad 374f31e364 Add mbstring identify filter for 'binary' encoding 2020-10-13 20:26:13 +02:00
Alex Dowad 97beecc251 Add identify filter for UTF-16, UTF-16LE, UTF-16BE
There was one faulty test in the suite which only passed before because UTF-16 had no
identify filter. After this was fixed, it exposed the problem with the test.
2020-10-13 20:26:13 +02:00
Christoph M. Becker 6af54d864d Merge branch 'PHP-8.0' into master
* PHP-8.0:
  Fix #64076: imap_sort() does not return FALSE on failure
2020-10-13 19:41:54 +02:00
Christoph M. Becker 5aec24c477 Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
  Fix #64076: imap_sort() does not return FALSE on failure
2020-10-13 19:41:27 +02:00
Christoph M. Becker d9058b61fb Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Fix #64076: imap_sort() does not return FALSE on failure
2020-10-13 19:38:31 +02:00
Christoph M. Becker db8bf0a9e0 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.
2020-10-13 19:37:05 +02:00
Nikita Popov 4371a4b241 Merge branch 'PHP-8.0'
* PHP-8.0:
  Fix incorrect zpp parameter count in mb_substr() / mb_strcut()
2020-10-13 17:47:11 +02:00
Nikita Popov 9b4094c3d7 Fix incorrect zpp parameter count in mb_substr() / mb_strcut()
These functions only accept 4 params.
2020-10-13 17:46:56 +02:00
Nikita Popov 66c332bfff Merge branch 'PHP-8.0'
* PHP-8.0:
  Fix default value for some pgsql functions
2020-10-13 17:29:16 +02:00
Nikita Popov a7e84e2e02 Fix default value for some pgsql functions
These set the PGSQL_DML_EXEC flag by default.
2020-10-13 17:29:05 +02:00
Nikita Popov 3581c77c76 Merge branch 'PHP-8.0'
* PHP-8.0:
  Fix null handling in mysqli_begin_transaction()
2020-10-13 17:13:14 +02:00
Nikita Popov d66e929915 Fix null handling in mysqli_begin_transaction()
We don't want an explicit null name hit the !name_len check.
2020-10-13 17:12:50 +02:00
Nikita Popov 40e920ebd9 Merge branch 'PHP-8.0'
* PHP-8.0:
  Fix argument nullability in mbstring
2020-10-13 16:03:29 +02:00
Nikita Popov 124bce3c7a Fix argument nullability in mbstring
These arguments were declared nullable in stubs (and should be
nullable), but didn't accept null in zpp.
2020-10-13 16:03:04 +02:00
Nikita Popov 5f11cdadf8 Merge branch 'PHP-8.0'
* PHP-8.0:
  Don't accept null in pg_unescape_bytea()
2020-10-13 15:37:23 +02:00
Nikita Popov 7b0f5f424d Don't accept null in pg_unescape_bytea()
This is an error that slipped in via 8d37c37bcd.
pg_unescape_bytea() did not accept null in PHP 7.4, and it is not
meaningful for it to accept null now -- it will always fail, and now
with a misleading OOM message.
2020-10-13 15:37:13 +02:00
Christoph M. Becker e6b1f45363 Merge branch 'PHP-8.0' into master
* PHP-8.0:
  Update ext/odbc parameter names
2020-10-13 15:34:48 +02:00
Christoph M. Becker 8e531b5b00 Update ext/odbc parameter names
Closes GH-6303.
2020-10-13 15:34:12 +02:00
Nikita Popov fbaa7a97e7 Merge branch 'PHP-8.0'
* PHP-8.0:
  Use $statement in mysqli
2020-10-13 14:20:13 +02:00
Nikita Popov e86a6ced06 Use $statement in mysqli
As we went with $statement rather than $stmts in other places,
let's also use it in mysqli. The discrepancy with mysqli_stmt
is a bit unfortunate, but we can't be consistent with *both*.

Closes GH-6330.
2020-10-13 14:20:00 +02:00
Derick Rethans 58e5335c00 Merge branch 'PHP-8.0' into master 2020-10-13 12:29:28 +01:00
Derick Rethans f22cc23c70 Merge branch 'PHP-7.4' into PHP-8.0 2020-10-13 12:29:14 +01:00
Derick Rethans 8fd8a1b128 Prepare for 7.4.13 2020-10-13 12:28:58 +01:00
Christoph M. Becker 98a20acbaa Merge branch 'PHP-8.0' into master
* PHP-8.0:
  Ignore memory leaks reported for some libc-client functions
2020-10-13 13:13:26 +02:00
Christoph M. Becker ade146c9ed Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
  Ignore memory leaks reported for some libc-client functions
2020-10-13 13:12:39 +02:00
Christoph M. Becker 9c7b607320 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.
2020-10-13 13:09:29 +02:00
Dmitry Stogov 95337e9702 Merge branch 'PHP-8.0'
* PHP-8.0:
  Give preference to live-ranges with register hints to improve register reuse.
2020-10-13 14:00:57 +03:00
Dmitry Stogov 62ae21bbf2 Give preference to live-ranges with register hints to improve register reuse. 2020-10-13 13:59:53 +03:00
Nikita Popov 12f33a3a4d Merge branch 'PHP-8.0'
* PHP-8.0:
  Update ext/pdo_pgsql parameter names
2020-10-13 12:32:08 +02:00
Nikita Popov ea03acadc2 Update ext/pdo_pgsql parameter names
Closes GH-6329.
2020-10-13 12:31:39 +02:00
Nikita Popov ddfa53ec60 Merge branch 'PHP-8.0'
* PHP-8.0:
  Update ext/pgsql parameter names
2020-10-13 12:30:59 +02:00
Nikita Popov 3171fec6da Update ext/pgsql parameter names
Closes GH-6294.
2020-10-13 12:30:44 +02:00
Nikita Popov 796d06b8ab Merge branch 'PHP-8.0'
* PHP-8.0:
  Fix handling of throwing undef var in verify return
2020-10-13 11:45:43 +02:00
Nikita Popov 1748b8111e Fix handling of throwing undef var in verify return
If we have an undefined variable and null is not accepted by the
return type, we want to throw just the undef var error.

In this case this lead to an infinite loop, because we overwrite
the exception opline in SAVE_OPLINE and it does not get reset
when chaining into a previous exception. Add an assertiong to
catch this case earlier.
2020-10-13 11:43:43 +02:00
Nikita Popov 19eb1b8602 Merge branch 'PHP-8.0'
* PHP-8.0:
  Update ext/sodium parameter names
2020-10-13 10:41:43 +02:00
Nikita Popov 8c68745f43 Update ext/sodium parameter names
Closes GH-6279.
2020-10-13 10:41:35 +02:00
Dmitry Stogov 184db168ab Merge branch 'PHP-8.0'
* PHP-8.0:
  Avoid useless register allocation
2020-10-13 11:37:51 +03:00
Dmitry Stogov 872787c5f7 Avoid useless register allocation 2020-10-13 11:37:33 +03:00
Nikita Popov 9987b3f35a Merge branch 'PHP-8.0'
* PHP-8.0:
  Update ext/phar parameter names
2020-10-13 10:21:41 +02:00
Nikita Popov 82d46e353b Update ext/phar parameter names
Closes GH-6307.
2020-10-13 10:20:45 +02:00
Christoph M. Becker 3f51db55be Merge branch 'PHP-8.0' into master
* PHP-8.0:
  7.3.25 is next
2020-10-13 09:56:32 +02:00
Christoph M. Becker 21dafab2f9 Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
  7.3.25 is next
2020-10-13 09:55:33 +02:00
Christoph M. Becker 8782c61f26 Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  7.3.25 is next
2020-10-13 09:53:52 +02:00
Christoph M. Becker 2d01a89ad1 7.3.25 is next 2020-10-13 09:52:46 +02:00
Alex Dowad a98838e3b6 Handle illegal bytes properly when converting to '7bit' encoding
Previously, mbstring would silently drop illegal bytes when converting a
string to '7bit' encoding.
2020-10-13 06:12:38 +02:00
Alex Dowad 4aa7430f68 Add mbstring identify filter for '7bit' encoding 2020-10-13 06:12:38 +02:00