53285891fb
Merge branch 'PHP-8.1'
2022-04-23 15:19:04 +01:00
8da14a3062
Merge branch 'PHP-8.0' into PHP-8.1
2022-04-23 15:16:00 +01:00
ff90d42b8b
Fix FPM kqueue handler fix remove callback typo
...
It avoids confusion on failed event.
2022-04-23 15:11:53 +01:00
4ec92c6253
Update NEWS and www.conf with listen.backlog default change
2022-04-23 13:25:08 +01:00
1e562683cb
fpm: listen backlog should default to -1 also on Linux
...
On linux -1 means system administrator choosen default or kernel
default, this varies between kernel versions or distributions
it used to be 128 now it is 4096.
2022-04-23 13:20:42 +01:00
436cffc971
Merge branch 'PHP-8.1'
2022-04-22 23:08:23 +01:00
abd56aeb9a
Merge branch 'PHP-8.0' into PHP-8.1
2022-04-22 23:07:01 +01:00
d8612fb6b7
Fix bug #77023 : FPM cannot shutdown processes
...
This change introduces subsequent kill of the process when idle process quit
(SIGQUIT) does not succeed. It can happen in some situations and means that FPM
is not able to scale down in dynamic pm. Using SIGKILL fixes the issue.
2022-04-22 20:51:02 +01:00
d87ba95acd
sapi/*: move duplicate "--define" code to library
2022-04-18 16:52:08 +02:00
1f0261a3e3
Merge branch 'PHP-8.1'
2022-04-15 22:21:50 +01:00
a57625374d
Merge branch 'PHP-8.0' into PHP-8.1
2022-04-15 22:21:18 +01:00
2f0918c638
Fix FPM socket clean up reallocation clang build warning
2022-04-15 22:20:15 +01:00
fc9fecbd09
Fix FPM zlog warning with var being uninitialized
2022-04-15 22:19:36 +01:00
7be195caa7
Support fpm_get_socket_listening_queue on macOS
...
Using TCP_CONNECTION_INFO socket option.
2022-04-15 21:21:43 +01:00
b0b416b705
Merge branch 'PHP-8.1'
2022-04-12 23:16:26 +01:00
62b676ff0f
Merge branch 'PHP-8.0' into PHP-8.1
2022-04-12 23:15:34 +01:00
33bb201b3e
Fix bug #76003 : FPM /status reports wrong number of active processe
...
The fix introduces early locking of scoreboard when it is updated
which prevents the race condition causing an incorrect number of
active processes being set.
2022-04-12 23:12:11 +01:00
7bb2a9ff38
Add extra check for FPM proc dumpable on SELinux based systems
...
The deny_ptrace is a OS runtime setting and is off by default,
at least on workstations flavors (fedora) however it might be
different on production servers.
2022-04-08 17:07:58 +01:00
2874e5fa05
FPM: Emit error for invalid port setting
2022-04-03 21:24:46 +01:00
2fc1ddc0f1
line break before --prefix in php-fpm man page
2022-03-27 17:44:31 +02:00
814374faa1
fpm zlog_stream_buf_alloc_ex little simplifications. ( #8224 )
2022-03-24 00:13:51 +00:00
bf2867bc72
Fix FSF address & update year to 2022
...
FSF mailing address was changed long time ago. This patch updates that address. Also updated year from 2021 to 2022.
Closes GH-8009.
2022-03-19 18:25:29 +01:00
1c381a7060
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix bugtracker URL
2022-02-15 19:15:53 +01:00
720d6faa29
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix bugtracker URL
2022-02-15 19:15:24 +01:00
e98a7a68b7
Fix bugtracker URL
...
The php-src bugtracker is now on Github.
Closes GH-8102.
2022-02-15 19:14:07 +01:00
354c52e9b6
Merge branch 'PHP-8.1'
2022-02-09 23:24:38 +00:00
49087a65ee
Merge branch 'PHP-8.0' into PHP-8.1
2022-02-09 23:23:05 +00:00
29fe06fa59
Fix bug #76109 : Implement fpm_scoreboard_copy
...
fpm_scoreboard_copy locks the scoreboard while copying the scoreboard and all
proc scoreboards. proc scoreboards are locked one by one while copying each
struct. The old implementation (inside fpm_handle_status_request) only briefly
locked the scoreboard while copying the scorebard.
Closes GH-7931
Co-authored-by: Jakub Zelenka <bukka@php.net >
2022-02-09 23:02:45 +00:00
d528d29ed4
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix memory leak on invalid port
2022-01-08 21:07:03 +01:00
2b07513192
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix memory leak on invalid port
2022-01-08 21:06:39 +01:00
c99a026c9c
Fix memory leak on invalid port
...
Closes GH-7911.
2022-01-08 21:04:55 +01:00
c70f3e0239
Merge branch 'PHP-8.1'
2022-01-04 23:03:38 +00:00
46bec6de42
Fix the OpenMetrics response format returned by the FPM status page
...
Closes GH-7843, closes GH-7842
2022-01-04 23:01:10 +00:00
8147fec372
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Fix buffer allocations in zlog_stream_set_msg_suffix()
2021-12-28 13:29:42 +01:00
5d4bef0d0c
Merge branch 'PHP-8.0' into PHP-8.1
...
* PHP-8.0:
Fix buffer allocations in zlog_stream_set_msg_suffix()
2021-12-28 13:28:55 +01:00
cb3d858745
Fix buffer allocations in zlog_stream_set_msg_suffix()
...
If that code was used, there would be a UAF scenario.
Closes GH-7835.
2021-12-28 13:27:54 +01:00
c4a1c0c18c
Merge branch 'PHP-8.1'
2021-11-27 22:43:37 +00:00
a529d0dd15
Merge branch 'PHP-8.0' into PHP-8.1
2021-11-27 22:39:51 +00:00
81513e6285
Add skip for FPM process idle flaky test
2021-11-27 22:37:43 +00:00
067df26344
Use memrchr() when available
...
On x86_64 glibc memrchr() uses SSE/AVX CPU extensions and works much
faster then naive loop. On x86 32-bit we still use inlined version.
memrchr() is a GNU extension. Its prototype becomes available when
<string.h> is included with defined _GNU_SOURCE macro. Previously, we
defined it in "php_config.h", but some sources may include <string.h>
befire it. To avod mess we also pass -D_GNU_SOURCE to C compiler.
2021-11-24 16:13:34 +03:00
7cbf4bde3e
Merge branch 'PHP-8.1'
...
* PHP-8.1:
Add FPM test for php_admin_value doc_root usage
Fix for bug in file handling refactor.
2021-11-23 18:36:45 +01:00
435a5aca89
Add FPM test for php_admin_value doc_root usage
...
Closes GH-7673.
2021-11-23 18:36:04 +01:00
636e54a1cb
Merge branch 'PHP-8.1'
2021-11-20 20:44:41 +00:00
79f0e486fd
Merge branch 'PHP-8.0' into PHP-8.1
2021-11-20 20:44:02 +00:00
2f8407f185
Increase read timeout in FPM process idle test
2021-11-20 20:42:19 +00:00
fc67967190
Increase script sleep in FPM process idle test
2021-11-20 20:42:19 +00:00
14db5fab11
Merge branch 'PHP-8.1'
2021-11-14 20:16:44 +00:00
48bc4ea758
Merge branch 'PHP-8.0' into PHP-8.1
2021-11-14 20:14:22 +00:00
ec3d4409a4
Merge branch 'PHP-7.4' into PHP-8.0
2021-11-14 20:10:42 +00:00
b2cf9b7ec7
Fix bug #81513 (Future possibility for heap overflow in FPM zlog)
...
This fixes currently unused code path in zlog that could lead to
the heap overflow in the future.
2021-11-14 20:08:57 +00:00
Jakub Zelenka