diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-03-19 08:51:39 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-03-19 08:51:55 +0100 |
| commit | 1d9e716a473951866ec82dbf651840e65d5dcb80 (patch) | |
| tree | 428651fb8580717e6d384c1f429293bc1bab7818 /ext/date/php_date.c | |
| parent | 280485adc1bae2b33f4eb42271ecd32d4bef3019 (diff) | |
| parent | d70058a139f3a45898e1f270c840fb64ea1a09f0 (diff) | |
| download | php-git-1d9e716a473951866ec82dbf651840e65d5dcb80.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #79396: DateTime hour incorrect during DST jump forward
Diffstat (limited to 'ext/date/php_date.c')
| -rw-r--r-- | ext/date/php_date.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 705057766a..8c6dfbbe3e 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -3573,6 +3573,7 @@ static void php_date_time_set(zval *object, zend_long h, zend_long i, zend_long dateobj->time->s = s; dateobj->time->us = ms; timelib_update_ts(dateobj->time, NULL); + timelib_update_from_sse(dateobj->time); } /* }}} */ /* {{{ proto DateTime date_time_set(DateTime object, int hour, int minute[, int second[, int microseconds]]) |