From: Joe Watkins <krakjoe@php.net>
Date: Wed, 19 Jun 2019 06:58:28 +0000 (+0200)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.4.0alpha2~58^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=025899e3b53e47cae9c1da4077988577b57e4b15;p=php

Merge branch 'PHP-7.2' into PHP-7.3

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

025899e3b53e47cae9c1da4077988577b57e4b15
diff --cc NEWS
index eb0fa3befe,2f11c32f3d..6350c55631
--- a/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)
  
+ - Date:
+   . Fixed #69044 (discrepency between time and microtime). (krakjoe)
+ 
 -27 Jun 2019, PHP 7.2.20
 +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 db08395fcb,24c199ec96..dfe49d2ab4
--- a/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));
  }
  /* }}} */