Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3: Fix GH-17208: bug64539-status-json-encoding.phpt fail on 32-bits
php · Dec 27, 2024 · 2161959 · 2161959
2 parents 575ee23 + 847d140
commit 2161959
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/NEWS b/NEWS
@@ -49,6 +49,8 @@ PHP                                                                        NEWS
   . Fixed bug GH-13437 (FPM: ERROR: scoreboard: failed to lock (already
     locked)). (Jakub Zelenka)
   . Fixed bug GH-17112 (Macro redefinitions). (cmb, nielsdos)
+  . Fixed bug GH-17208 (bug64539-status-json-encoding.phpt fail on 32-bits).
+    (nielsdos)
 
 - GD:
   . Fixed bug GH-16255 (Unexpected nan value in ext/gd/libgd/gd_filter.c).

diff --git a/sapi/fpm/fpm/fpm_status.c b/sapi/fpm/fpm/fpm_status.c
@@ -608,7 +608,7 @@ int fpm_status_handle_request(void) /* {{{ */
 					time_buffer,
 					(unsigned long) (now_epoch - proc->start_epoch),
 					proc->requests,
-					duration.tv_sec * 1000000UL + duration.tv_usec,
+					(unsigned long) (duration.tv_sec * 1000000UL + duration.tv_usec),
 					proc->request_method[0] != '\0' ? proc->request_method : "-",
 					proc->request_uri[0] != '\0' ? proc->request_uri : "-",
 					query_string ? "?" : "",