diff options
| author | Joe Watkins <krakjoe@php.net> | 2019-06-19 08:58:28 +0200 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2019-06-19 08:59:04 +0200 |
| commit | 025899e3b53e47cae9c1da4077988577b57e4b15 (patch) | |
| tree | 8286e02d4d8334803be0ef1f0ba2a5f1ec646c10 | |
| parent | 96663fd6aeda350cc2b51c975d7fa46315efc106 (diff) | |
| parent | 65067dff01fc3a46861ddfe0fe6d3e556460c146 (diff) | |
| download | php-git-025899e3b53e47cae9c1da4077988577b57e4b15.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Resolve discrepencies between second value yielded by gettimeofday and time, fixes #69044
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/date/php_date.c | 34 |
2 files changed, 28 insertions, 9 deletions
@@ -5,6 +5,9 @@ PHP NEWS - Core: . Added syslog.filter=raw option. (Erik Lundin) +- Date: + . Fixed #69044 (discrepency between time and microtime). (krakjoe) + 27 Jun 2019, PHP 7.3.7 - Core: diff --git a/ext/date/php_date.c b/ext/date/php_date.c index db08395fcb..dfe49d2ab4 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -60,6 +60,22 @@ static inline long long php_date_llabs( long long i ) { return i >= 0 ? i : -i; #endif #endif +static time_t php_time() +{ +#ifdef HAVE_GETTIMEOFDAY + struct timeval tm; + + if (UNEXPECTED(gettimeofday(&tm, NULL) != SUCCESS)) { + /* fallback, can't reasonably happen */ + return time(NULL); + } + + return tm.tv_sec; +#else + return time(NULL); +#endif +} + /* {{{ arginfo */ ZEND_BEGIN_ARG_INFO_EX(arginfo_date, 0, 0, 1) ZEND_ARG_INFO(0, format) @@ -1283,7 +1299,7 @@ static void php_date(INTERNAL_FUNCTION_PARAMETERS, int localtime) ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE); if (ZEND_NUM_ARGS() == 1) { - ts = time(NULL); + ts = php_time(); } RETURN_STR(php_format_date(ZSTR_VAL(format), ZSTR_LEN(format), ts, localtime)); @@ -1448,7 +1464,7 @@ PHP_FUNCTION(idate) } if (ZEND_NUM_ARGS() == 1) { - ts = time(NULL); + ts = php_time(); } ret = php_idate(ZSTR_VAL(format)[0], ts, 0); @@ -1520,7 +1536,7 @@ PHP_FUNCTION(strtotime) now->tz_info = tzi; now->zone_type = TIMELIB_ZONETYPE_ID; timelib_unixtime2local(now, - (ZEND_NUM_ARGS() == 2) ? (timelib_sll) preset_ts : (timelib_sll) time(NULL)); + (ZEND_NUM_ARGS() == 2) ? (timelib_sll) preset_ts : (timelib_sll) php_time()); t = timelib_strtotime(ZSTR_VAL(times), ZSTR_LEN(times), &error, DATE_TIMEZONEDB, php_date_parse_tzfile_wrapper); @@ -1563,12 +1579,12 @@ PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt) /* Initialize structure with current time */ now = timelib_time_ctor(); if (gmt) { - timelib_unixtime2gmt(now, (timelib_sll) time(NULL)); + timelib_unixtime2gmt(now, (timelib_sll) php_time()); } else { tzi = get_timezone_info(); now->tz_info = tzi; now->zone_type = TIMELIB_ZONETYPE_ID; - timelib_unixtime2local(now, (timelib_sll) time(NULL)); + timelib_unixtime2local(now, (timelib_sll) php_time()); } /* Fill in the new data */ switch (ZEND_NUM_ARGS()) { @@ -1669,7 +1685,7 @@ PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gmt) timelib_time_offset *offset = NULL; zend_string *buf; - timestamp = (zend_long) time(NULL); + timestamp = (zend_long) php_time(); ZEND_PARSE_PARAMETERS_START(1, 2) Z_PARAM_STR(format) @@ -1777,7 +1793,7 @@ PHP_FUNCTION(time) return; } - RETURN_LONG((zend_long)time(NULL)); + RETURN_LONG((zend_long)php_time(NULL)); } /* }}} */ @@ -1785,7 +1801,7 @@ PHP_FUNCTION(time) Returns the results of the C system call localtime as an associative array if the associative_array argument is set to 1 other wise it is a regular array */ PHP_FUNCTION(localtime) { - zend_long timestamp = (zend_long)time(NULL); + zend_long timestamp = (zend_long)php_time(); zend_bool associative = 0; timelib_tzinfo *tzi; timelib_time *ts; @@ -1834,7 +1850,7 @@ PHP_FUNCTION(localtime) Get date/time information */ PHP_FUNCTION(getdate) { - zend_long timestamp = (zend_long)time(NULL); + zend_long timestamp = (zend_long)php_time(); timelib_tzinfo *tzi; timelib_time *ts; |