1
0
mirror of https://github.com/php/php-src.git synced 2026-04-21 15:08:16 +02:00
Commit Graph

1157 Commits

Author SHA1 Message Date
Jakub Zelenka 305d5e12df Merge branch 'PHP-8.1' 2022-06-19 20:12:43 +01:00
Jakub Zelenka b3e6faed48 Merge branch 'PHP-8.0' into PHP-8.1 2022-06-19 20:09:37 +01:00
Jakub Zelenka e330f443c9 Fix bug #67764: fpm: syslog.ident does not work 2022-06-19 20:05:49 +01:00
David Carlier f25afaf9ea Merge branch 'PHP-8.1' 2022-06-16 12:44:48 +01:00
David Carlier 75743eaf1b Merge branch 'PHP-8.0' into PHP-8.1 2022-06-16 12:41:51 +01:00
Heiko Weber a83363e361 FPM: Fix use after free in fpm_evaluate_full_path
Closes #8796.
2022-06-16 12:18:01 +01:00
David CARLIER daba5fb43f fpm sockets set listen back queue size to negative which trim down (#8638)
to the SOMAXCONN hard limit on macOs.
2022-05-30 13:12:52 +01:00
Quarkay 312fa05a29 Deal with compiler warning in file sapi/fpm/fpm/fpm_conf.c 2022-05-28 15:57:36 +02:00
Christoph M. Becker 81d1a1b47b Update bug tracker links
The new php-src bugtracker is on Github.

Closes GH-8277.
2022-05-12 14:55:11 +02:00
Jakub Zelenka 9149d165ee Merge branch 'PHP-8.1' 2022-05-10 21:40:44 +01:00
Jakub Zelenka 82eea0efc9 Merge branch 'PHP-8.0' into PHP-8.1 2022-05-10 21:39:31 +01:00
Jakub Zelenka 23a2030438 Fix bug #72185: php-fpm writes empty fcgi record causing nginx 502
This issue might happen if there is change of the fcgi stream when
the buffer is full. Then the empty record is created which signals
end of stream which is incorrect.

The actual fix without a test was contributed by GitHub user @loveharmful
in GH-3198.
2022-05-10 21:36:55 +01:00
Jakub Zelenka 6e0a378c8b Merge branch 'PHP-8.1' 2022-04-29 20:44:35 +01:00
Jakub Zelenka 0332b62c35 Merge branch 'PHP-8.0' into PHP-8.1 2022-04-29 20:41:13 +01:00
David CARLIER ef06f0f50b Fix FPM ACL build check on MacOS
MacOS has got ACL support but without user/group support.
2022-04-29 20:39:22 +01:00
George Peter Banyard b5db594fd2 Refacto php_module_startup() (#8303)
It only ever uses at most 1 additional modules
2022-04-27 23:07:11 +01:00
Jakub Zelenka 09d313daac Merge branch 'PHP-8.1' 2022-04-27 19:17:33 +01:00
Jakub Zelenka 21d551ad0f Merge branch 'PHP-8.0' into PHP-8.1 2022-04-27 19:14:47 +01:00
Jakub Zelenka 0df28869f6 Add skip for FPM resource heavy tests 2022-04-27 19:11:47 +01:00
Ilija Tovilo 619f40f14c Fix leak introduced by GH-8241 (#8403)
Temporarily store result of ini builder in ini_entries to avoid a leak
when main() exists prematurely. Technically ini_entries isn't released
either but ASAN doesn't consider unreleased memory referenced from
globals leaks.
2022-04-25 09:31:51 +02:00
Jakub Zelenka 53285891fb Merge branch 'PHP-8.1' 2022-04-23 15:19:04 +01:00
Jakub Zelenka 8da14a3062 Merge branch 'PHP-8.0' into PHP-8.1 2022-04-23 15:16:00 +01:00
David Carlier ff90d42b8b Fix FPM kqueue handler fix remove callback typo
It avoids confusion on failed event.
2022-04-23 15:11:53 +01:00
Jakub Zelenka 4ec92c6253 Update NEWS and www.conf with listen.backlog default change 2022-04-23 13:25:08 +01:00
Cristian Rodríguez 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
Jakub Zelenka 436cffc971 Merge branch 'PHP-8.1' 2022-04-22 23:08:23 +01:00
Jakub Zelenka abd56aeb9a Merge branch 'PHP-8.0' into PHP-8.1 2022-04-22 23:07:01 +01:00
Jakub Zelenka 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
Max Kellermann d87ba95acd sapi/*: move duplicate "--define" code to library 2022-04-18 16:52:08 +02:00
Jakub Zelenka 1f0261a3e3 Merge branch 'PHP-8.1' 2022-04-15 22:21:50 +01:00
Jakub Zelenka a57625374d Merge branch 'PHP-8.0' into PHP-8.1 2022-04-15 22:21:18 +01:00
David Carlier 2f0918c638 Fix FPM socket clean up reallocation clang build warning 2022-04-15 22:20:15 +01:00
David Carlier fc9fecbd09 Fix FPM zlog warning with var being uninitialized 2022-04-15 22:19:36 +01:00
David CARLIER 7be195caa7 Support fpm_get_socket_listening_queue on macOS
Using TCP_CONNECTION_INFO socket option.
2022-04-15 21:21:43 +01:00
Jakub Zelenka b0b416b705 Merge branch 'PHP-8.1' 2022-04-12 23:16:26 +01:00
Jakub Zelenka 62b676ff0f Merge branch 'PHP-8.0' into PHP-8.1 2022-04-12 23:15:34 +01:00
Jakub Zelenka 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
David Carlier 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
David Carlier 2874e5fa05 FPM: Emit error for invalid port setting 2022-04-03 21:24:46 +01:00
Martin Kealey 2fc1ddc0f1 line break before --prefix in php-fpm man page 2022-03-27 17:44:31 +02:00
David CARLIER 814374faa1 fpm zlog_stream_buf_alloc_ex little simplifications. (#8224) 2022-03-24 00:13:51 +00:00
istiak101 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
Christoph M. Becker 1c381a7060 Merge branch 'PHP-8.1'
* PHP-8.1:
  Fix bugtracker URL
2022-02-15 19:15:53 +01:00
Christoph M. Becker 720d6faa29 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Fix bugtracker URL
2022-02-15 19:15:24 +01:00
Christoph M. Becker e98a7a68b7 Fix bugtracker URL
The php-src bugtracker is now on Github.

Closes GH-8102.
2022-02-15 19:14:07 +01:00
Jakub Zelenka 354c52e9b6 Merge branch 'PHP-8.1' 2022-02-09 23:24:38 +00:00
Jakub Zelenka 49087a65ee Merge branch 'PHP-8.0' into PHP-8.1 2022-02-09 23:23:05 +00:00
Till Backhaus 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
Christoph M. Becker d528d29ed4 Merge branch 'PHP-8.1'
* PHP-8.1:
  Fix memory leak on invalid port
2022-01-08 21:07:03 +01:00
Christoph M. Becker 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