php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.3' into PHP-8.4

Browse Source 
* PHP-8.3:
  Fix GH-17208: bug64539-status-json-encoding.phpt fail on 32-bits
This commit is contained in:
Niels Dossche
2024-12-27 21:48:52 +01:00
parent 575ee23bd9 847d1401a0
commit 2161959834
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@@ -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).

2
sapi/fpm/fpm/fpm_status.c
View File

@@ -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 ? "?" : "",