archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.2' into PHP-8.3

Browse source 
* PHP-8.2:
  [ci skip] NEWS
  Fix incorrect check in fpm_shm_free() (#13797)
This commit is contained in:
Niels Dossche 2024-03-24 13:58:41 +01:00
commit 81ae6064ce
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -17,6 +17,7 @@ PHP NEWS
- FPM:
. Fixed GH-11086 (FPM: config test runs twice in daemonised mode).
(Jakub Zelenka)
. Fix incorrect check in fpm_shm_free(). (nielsdos)
- GD:
. Fixed bug GH-12019 (add GDLIB_CFLAGS in feature tests). (Michael Orlitzky)

2
sapi/fpm/fpm/fpm_shm.c
View file

@ -50,7 +50,7 @@ int fpm_shm_free(void *mem, size_t size) /* {{{ */
return 0;
}
if (fpm_shm_size - size > 0) {
if (fpm_shm_size > size) {
fpm_shm_size -= size;
} else {
fpm_shm_size = 0;