Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #78642: Wrong libiconv version displayed

diff --cc NEWS
index 28e399d3b46bf85767ce4bbc62271ea11d6a68b8,b7d193ab58164d4ad3c9b9cdfa9376e671e5e2ab..8f79383ca56322cfc16b861a0e0c6bc61d1593a5
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,48 -1,25 +1,52 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? ????, PHP 7.3.12
 +?? ??? ????, PHP 7.4.0RC4
 +
 +- Core:
 +  . Fixed bug #78614 (Does not compile with DTRACE anymore).
 +    (tz at FreeBSD dot org)
 +  . Fixed bug #78620 (Out of memory error). (cmb, Nikita)
 +  . Fixed bug #78632 (method_exists() in php74 works differently from php73 in
 +    checking priv. methods). (Nikita)
  
 -24 Oct 2019, PHP 7.3.11
+ - Iconv:
+   . Fixed bug #78642 (Wrong libiconv version displayed). (gedas at martynas,
+     cmb).
+ 
 +- Pcntl:
 +  . Fixed bug #77335 (PHP is preventing SIGALRM from specifying SA_RESTART).
 +    (Nikita)
 +
 +- MySQLi:
 +  . Fixed bug #76809 (SSL settings aren't respected when persistent connections 
 +    are used). (fabiomsouto)
 +
 +- PDO_MySQL:
 +  . Fixed bug #78623 (Regression caused by "SP call yields additional empty
 +    result set"). (cmb)
 +
 +- SimpleXML:
 +  . Fixed bug #75245 (Don't set content of elements with only whitespaces). 
 +    (eriklundin)
 +
 +- Standard:
 +  . Fixed bug #76859 (stream_get_line skips data if used with data-generating 
 +    filter). (kkopachev)
 +
 +- Zip:
 +  . Fixed bug #78641 (addGlob can modify given remove_path value). (cmb)
 +
 +03 Oct 2019, PHP 7.4.0RC3
  
  - Core:
 -  . Fixed bug #78535 (auto_detect_line_endings value not parsed as bool).
 -    (bugreportuser)
 -  . Fixed bug #78620 (Out of memory error). (cmb, Nikita)
 +  . Fixed bug #78604 (token_get_all() does not properly tokenize FOO<?php with
 +    short_open_tag=0). (Nikita)
  
 -- Exif :
 -  . Fixed bug #78442 ('Illegal component' on exif_read_data since PHP7)
 -      (Kalle)
 +- FFI:
 +  . Fixed bug #78543 (is_callable() on FFI\CData throws Exception). (cmb)
  
 -- FPM:
 -  . Fixed bug #78413 (request_terminate_timeout does not take effect after
 -    fastcgi_finish_request). (Sergei Turchanov)
 +- GMP:
 +  . Fixed bug #78574 (broken shared build). (Remi)
  
  - MBString:
    . Fixed bug #78579 (mb_decode_numericentity: args number inconsistency).

diff --cc ext/iconv/iconv.c
Simple merge