Skip to content

Commit 2161959

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3: Fix GH-17208: bug64539-status-json-encoding.phpt fail on 32-bits
2 parents 575ee23 + 847d140 commit 2161959

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

NEWS

+2
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ PHP NEWS
4949
. Fixed bug GH-13437 (FPM: ERROR: scoreboard: failed to lock (already
5050
locked)). (Jakub Zelenka)
5151
. Fixed bug GH-17112 (Macro redefinitions). (cmb, nielsdos)
52+
. Fixed bug GH-17208 (bug64539-status-json-encoding.phpt fail on 32-bits).
53+
(nielsdos)
5254

5355
- GD:
5456
. Fixed bug GH-16255 (Unexpected nan value in ext/gd/libgd/gd_filter.c).

sapi/fpm/fpm/fpm_status.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ int fpm_status_handle_request(void) /* {{{ */
608608
time_buffer,
609609
(unsigned long) (now_epoch - proc->start_epoch),
610610
proc->requests,
611-
duration.tv_sec * 1000000UL + duration.tv_usec,
611+
(unsigned long) (duration.tv_sec * 1000000UL + duration.tv_usec),
612612
proc->request_method[0] != '\0' ? proc->request_method : "-",
613613
proc->request_uri[0] != '\0' ? proc->request_uri : "-",
614614
query_string ? "?" : "",

0 commit comments

Comments
 (0)