diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-07-03 10:00:05 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-07-03 10:02:22 +0200 |
| commit | 5e5b7cb4d4fe72052a9408dccfee7d41063a3586 (patch) | |
| tree | 22aab7e3e59889036af385a8c1dbe1dd8f365f97 /TSRM | |
| parent | 9ad09ce905f97f0cb8b1ca4dc9589e4da9d09a70 (diff) | |
| parent | 44c8b7414ce96038017edc2fd827f8250669a62a (diff) | |
| download | php-git-5e5b7cb4d4fe72052a9408dccfee7d41063a3586.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
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 a7956caf90..5f0ebba5ae 100644 --- a/TSRM/tsrm_win32.c +++ b/TSRM/tsrm_win32.c @@ -770,7 +770,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; } |