Merge branch 'PHP-7.2' into PHP-7.3

cmb69 · cmb69 · commit 9ea39d15abef · 2019-08-06T17:28:11.000+02:00
* PHP-7.2:
  Fix #78282: atime and mtime mismatch
diff --git a/NEWS b/NEWS
@@ -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
@@ -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;
 }

Original file line number	Diff line number	Diff line change
`@@ -770,7 +770,7 @@ static zend_always_inline void UnixTimeToFileTime(time_t t, LPFILETIME pft) /* {`
`770`	`770`	`// Note that LONGLONG is a 64-bit value`
`771`	`771`	`LONGLONG ll;`
`772`	`772`
`773`		`- ll = t * 10000000 + 116444736000000000;`
	`773`	`+ ll = t * 10000000LL + 116444736000000000LL;`
`774`	`774`	`pft->dwLowDateTime = (DWORD)ll;`
`775`	`775`	`pft->dwHighDateTime = ll >> 32;`
`776`	`776`	`}`