462da6e09c
Fix spelling and grammar mistakes
...
This PR corrects misspellings identified by the check-spelling action.
The misspellings have been reported at jsoref@b6ba3e2#commitcomment-48946465
The action reports that the changes in this PR would make it happy: jsoref@602417c
Closes GH-6822.
2021-04-13 12:09:37 +02:00
3e5afbf0a8
Refactore FPM logging
2018-07-07 13:01:44 +01:00
ad8b99c888
Fix some typos in PHP FPM configuration
...
[skip ci]
2016-08-15 22:50:14 +02:00
9f189dd290
split fpm config to two parts. PR#903
...
main config = global options
secondary config = pool options
makes easier to add new pools:
duplicate pool config in fpm.d dir
https://bugs.php.net/bug.php?id=67106
2014-12-14 14:21:46 +01:00
70c141b8f8
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix typo
2014-12-14 09:23:25 +01:00
505adabf25
fix typo
2014-12-14 09:22:59 +01:00
19d481945e
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
Fix bug #68526 Implement POSIX Access Control List for UDS
2014-12-10 08:19:29 +01:00
744ada7d9d
Fix bug #68526 Implement POSIX Access Control List for UDS
...
- add --with-fpm-acl build option which allow to manage ACL
on Unix Domain Socket
- add listen.acl_users pool option
- add listen.acl_groups pool option
Keep old behavior (chmod) if option not used or not supported.
2014-12-10 08:15:21 +01:00
95a609c5d1
FPM: change "listen = port" behavior from IPv4 catch-all to IPv6 catch-all (+ IPv4-mapped)
2014-11-24 09:38:36 +01:00
48fa365006
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
minor typo in test
add test for global / pool prefix and bug #68478
Fixed Bug #68478 acess_log don't use prefix
2014-11-22 10:31:26 +01:00
b924af8db9
Fixed Bug #68478 acess_log don't use prefix
...
Calling fpm_conf_process_all_pools before fpm_log_open
allow to use fpm_evaluate_full_path and so to honor
global prefix or pool prefix for access.log
2014-11-22 10:25:53 +01:00
ab2215deb3
update fpm configuration for #68428
2014-11-17 09:43:51 +01:00
d9fd670fdc
update fpm configuration for #68428
2014-11-17 09:43:23 +01:00
2b1f90af2b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
comment about ipv4-mapped in fpm conf
Improve fix bug #68421 access.format='%R' doesn't log ipv6 address
2014-11-17 06:59:03 +01:00
4475cbdc85
comment about ipv4-mapped in fpm conf
2014-11-17 06:57:59 +01:00
9e3ebd3a0d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
improve comments about FPM listen option
2014-11-16 18:01:01 +01:00
23fd22f9ed
improve comments about FPM listen option
2014-11-16 17:59:36 +01:00
e13e305b93
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS entry for previous commit
NEWS entry for previous commit
add IPv6 support to php-fpm
2014-10-03 11:40:05 +02:00
15ba757a2b
add IPv6 support to php-fpm
2014-10-03 11:35:27 +02:00
cf0303e782
Replaces php5 with php7, without whitespace changes.
2014-09-20 10:01:44 +02:00
770fcdab90
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #67060 : use default mode of 660
2014-04-29 09:15:23 -07:00
35ceea928b
Fix bug #67060 : use default mode of 660
2014-04-29 09:14:11 -07:00
5811610d71
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #66482 , replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
2014-04-13 17:31:44 -07:00
636adf251c
Fix bug #66482 , replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
2014-04-13 17:30:50 -07:00
eb6941e902
add clear_env option to FPM config
...
This makes it possible to leave the envoronment as is on startup and
pass all the variables to the workers.
The default value of clear_env is "yes", preserving previous behaviour.
Patch by Paul Annesley.
2014-02-25 12:12:09 +04:00
6e15afd1be
add clear_env option to FPM config
...
This makes it possible to leave the envoronment as is on startup and
pass all the variables to the workers.
The default value of clear_env is "yes", preserving previous behaviour.
Patch by Paul Annesley.
2014-02-25 12:06:32 +04:00
9765763413
increase backlog to the highest value everywhere
...
It makes no sense to use -1 for *BSD (which is the highest value there)
and still use 128 for Linux.
Lets raise it right to up the limit and let the people lower it if they
think that 3.5Mb is too much for a process.
IMO this is better than silently dropping connections.
2013-10-27 22:54:47 +04:00
8d86597d73
non living code related typo fixes
2013-08-04 16:05:36 -07:00
e9a95d78ef
typo fixes
2013-07-15 00:23:03 -07:00
04145dc2aa
typo fixes (argument)
2013-06-10 13:36:17 -07:00
0e99329e0a
Add --with-fpm-systemd option to report health to systemd, and
...
systemd_interval option to configure this. The service can now use
Type=notify in the systemd unit file.
Systemd status line will looks like:
Status: "Processes active: 0, idle: 5, Requests: 90, slow: 0, Traffic: 10req/sec"
Watchdog mode is also supported. In this case watchdog interval,
configured in the unit file, override the systemd_interval option.
When not used (default), no change from previous version.
2013-05-21 09:49:00 +02:00
decc394a20
- Fixed bug #62160 (Add process.priority to set nice(2) priorities)
2012-05-26 18:24:08 +02:00
1034cbc758
- Implemented FR #52569 (Add the "ondemand" process-manager to allow zero children)
2011-10-08 21:04:10 +00:00
f577f22de0
order fpm configuration items the same way in php-fpm.conf.in, fpm_conf.h and fpm_conf.c
2011-07-18 21:49:38 +00:00
7cdef345d5
- Implemented FR #55166 (Added process.max to control the number of process FPM can fork)
2011-07-17 11:41:57 +00:00
2f0a379c03
- Implemented FR #55181 (Enhance security by limiting access to user defined extensions)
2011-07-12 23:00:42 +00:00
505537274d
- Implemented FR #54098 (Lowered default value for Process Manager)
2011-07-05 21:03:26 +00:00
5842a4147f
- FR #52052 : Added partial syslog support (on error_log only)
2011-07-05 19:22:45 +00:00
aba5ecbad9
fix comment syntax
2011-07-04 12:49:46 +00:00
1e0cb5fec5
- Implemented FR #54577 (Enhanced status page with full status and details about each processes
...
- Added a web page (status.html) for real-time FPM status
- Fixed missing Expires and Cache-Control headers for ping and status pages
2011-07-02 16:10:18 +00:00
73b6310098
- Added custom access log (also added per request %CPU and memory mesurement)
2011-06-23 08:03:52 +00:00
886cf1a318
Added master rlimit_files and rlimit_core in the global configuration settings
2011-06-18 16:27:48 +00:00
dec96a12fa
missing doc in the conf file
2011-06-17 23:35:47 +00:00
f7cd7afd33
- Fixed bug #52501 (libevent made FPM crashed when forking -- libevent has been removed)
2010-11-26 13:46:15 +00:00
ae01a576b3
- Fixed #52691 (allow multiple instance of FPM using a custom prefix)
2010-11-14 22:01:34 +00:00
4d62c8c501
- add 'max children reached' to the FPM status page. It shows how many times
...
a pool has reached the max_children parameter.
2010-08-31 14:49:16 +00:00
bf28d740e3
- Changed listen.backlog in the FPM configuration file to default to 128
...
instead of -1 (except on FreeBSD and OpenBSD). This is the same value
as the one used in the cgi sapi. This patch completes revision 302725.
2010-08-31 09:33:53 +00:00
266e369184
- Changed listen.backlog in the FPM configuration file to default to 128
...
instead of -1. This is the same value as the one used in the cgi sapi.
2010-08-23 23:22:36 +00:00
5181210a7a
correct php-fpm.conf: slowlog has no default value
2010-08-02 09:02:48 +00:00
bc4c3fdd83
typo (thx to Brian P. Mercer)
2010-05-29 10:39:35 +00:00
Josh Soref