diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-08-06 17:27:32 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-08-06 17:28:11 +0200 |
| commit | 9ea39d15abef3df259e0aa2974d1c530654aa2b1 (patch) | |
| tree | e8dd8f19e3db677bc2949a22d84f529756156fa4 | |
| parent | a87ef5e3ddfdb3083c2b62bb25835b74d9a3d083 (diff) | |
| parent | 954543cec629c3c5d42c2d62228dd68604bb6b19 (diff) | |
| download | php-git-9ea39d15abef3df259e0aa2974d1c530654aa2b1.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #78282: atime and mtime mismatch
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | TSRM/tsrm_win32.c | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -31,6 +31,7 @@ PHP NEWS - Standard: . Fixed bug #69100 (Bus error from stream_copy_to_stream (file -> SSL stream) with invalid length). (Nikita) + . Fixed bug #78282 (atime and mtime mismatch). (cmb) . Fixed bug #78326 (improper memory deallocation on stream_get_contents() with fixed length buffer). (Albert Casademont) . Fixed bug #78346 (strip_tags no longer handling nested php tags). (cmb) diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c index 5f0ebba5ae..06ca965d64 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 = t * 10000000 + 116444736000000000; + ll = t * 10000000LL + 116444736000000000LL; pft->dwLowDateTime = (DWORD)ll; pft->dwHighDateTime = ll >> 32; } |