Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Resolve discrepencies between second value yielded by gettimeofday and time, fixes #69044

diff --cc NEWS
index eb0fa3befee2150fbf37b1d1d41d592aaf0eeed5,2f11c32f3d1bca779c1ea38c8d20e5b1275bc0bf..6350c55631f04465dd603ec1265b3d5028d40166
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,11 -1,15 +1,14 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2019, PHP 7.2.21
 +?? ??? ????, PHP 7.3.8
  
 -- XMLRPC:
 -  . Fixed #78173 (XML-RPC mutates immutable objects during encoding). (Asher
 -    Baker)
 +- Core:
 +  . Added syslog.filter=raw option. (Erik Lundin)
  
 -27 Jun 2019, PHP 7.2.20
+ - Date:
+   . Fixed #69044 (discrepency between time and microtime). (krakjoe)
+ 
 +27 Jun 2019, PHP 7.3.7
  
  - Core:
    . Fixed bug #76980 (Interface gets skipped if autoloader throws an exception).

diff --cc ext/date/php_date.c
index db08395fcb9c5befc262367b6d16185f6b582ac3,24c199ec96eac7021138cabf7ee5051bf057c489..dfe49d2ab4a04e63f7cc7c01ea3d10fe8b4c72f1
--- 1/ext/date/php_date.c
--- 2/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@@ -1773,11 -1771,7 +1789,11 @@@ PHP_FUNCTION(gmstrftime
     Return current UNIX timestamp */
  PHP_FUNCTION(time)
  {
 -      RETURN_LONG((zend_long)php_time());
 +      if (zend_parse_parameters_none() == FAILURE) {
 +              return;
 +      }
 +
-       RETURN_LONG((zend_long)time(NULL));
++      RETURN_LONG((zend_long)php_time(NULL));
  }
  /* }}} */