Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #78579: mb_decode_numericentity: args number inconsistency
This commit is contained in:
Christoph M. Becker 2019-09-21 16:16:09 +02:00
commit 698088ca7c
2 changed files with 5 additions and 0 deletions

4
NEWS
View File

@ -10,6 +10,10 @@ PHP NEWS
. Fixed bug #78442 ('Illegal component' on exif_read_data since PHP7)
(Kalle)
- MBString:
. Fixed bug #78579 (mb_decode_numericentity: args number inconsistency).
(cmb)
- Mysqlnd:
. Fixed bug #78525 (Memory leak in pdo when reusing native prepared
statements). (Nikita)

View File

@ -407,6 +407,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_decode_numericentity, 0, 0, 2)
ZEND_ARG_INFO(0, string)
ZEND_ARG_INFO(0, convmap)
ZEND_ARG_INFO(0, encoding)
ZEND_ARG_INFO(0, is_hex)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_send_mail, 0, 0, 3)