diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-07-03 10:02:44 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-07-03 10:03:14 +0200 |
| commit | b4c81be9c5e9bfb6ec23de038da4d3a6a206187c (patch) | |
| tree | 2704c3bb1d61103a74178c33313f8a9b3aaec681 /TSRM | |
| parent | 56b8b165f87e54c8f381d4acfa0b1459b240b74a (diff) | |
| parent | 5e5b7cb4d4fe72052a9408dccfee7d41063a3586 (diff) | |
| download | php-git-b4c81be9c5e9bfb6ec23de038da4d3a6a206187c.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78241: touch() does not handle dates after 2038 in PHP 64-bit
Diffstat (limited to 'TSRM')
| -rw-r--r-- | TSRM/tsrm_win32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c index af875fa2a0..e510c61426 100644 --- a/TSRM/tsrm_win32.c +++ b/TSRM/tsrm_win32.c @@ -769,7 +769,7 @@ static zend_always_inline void UnixTimeToFileTime(time_t t, LPFILETIME pft) /* { // Note that LONGLONG is a 64-bit value LONGLONG ll; - ll = Int32x32To64(t, 10000000) + 116444736000000000; + ll = t * 10000000 + 116444736000000000; pft->dwLowDateTime = (DWORD)ll; pft->dwHighDateTime = ll >> 32; } |