archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.1' into PHP-8.2

Browse source
This commit is contained in:
Jakub Zelenka 2023-01-13 10:32:52 +00:00
commit a8c387e89c
No known key found for this signature in database
GPG key ID: 1C0779DC5C0A9DE4
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -14,6 +14,8 @@ PHP NEWS
. Fixed bug #68591 (Configuration test does not perform UID lookups). . Fixed bug #68591 (Configuration test does not perform UID lookups).
(Jakub Zelenka) (Jakub Zelenka)
. Fixed memory leak when running FPM config test. (Jakub Zelenka) . Fixed memory leak when running FPM config test. (Jakub Zelenka)
. Fixed bug #67244 (Wrong owner:group for listening unix socket).
(Jakub Zelenka)
- LDAP: - LDAP:
. Fixed bug GH-10112 (LDAP\Connection::__construct() refers to ldap_create()). . Fixed bug GH-10112 (LDAP\Connection::__construct() refers to ldap_create()).

16
sapi/fpm/www.conf.in
View file

@ -17,9 +17,14 @@
; Default Value: none ; Default Value: none
;prefix = /path/to/pools/$pool ;prefix = /path/to/pools/$pool
; Unix user/group of processes ; Unix user/group of the child processes. This can be used only if the master
; Note: The user is mandatory. If the group is not set, the default user's group ; process running user is root. It is set after the child process is created.
; will be used. ; The user and group can be specified either by their name or by their numeric
; IDs.
; Note: If the user is root, the executable needs to be started with
--allow-to-run-as-root option to work.
; Default Values: The user is set to master process running user by default.
; If the group is not set, the user's group is used.
user = @php_fpm_user@ user = @php_fpm_user@
group = @php_fpm_group@ group = @php_fpm_group@
@ -43,11 +48,12 @@ listen = 127.0.0.1:9000
; permissions must be set in order to allow connections from a web server. Many ; permissions must be set in order to allow connections from a web server. Many
; BSD-derived systems allow connections regardless of permissions. The owner ; BSD-derived systems allow connections regardless of permissions. The owner
; and group can be specified either by name or by their numeric IDs. ; and group can be specified either by name or by their numeric IDs.
; Default Values: user and group are set as the running user ; Default Values: Owner is set to the master process running user. If the group
; mode is set to 0660 ; is not set, the owner's group is used. Mode is set to 0660.
;listen.owner = @php_fpm_user@ ;listen.owner = @php_fpm_user@
;listen.group = @php_fpm_group@ ;listen.group = @php_fpm_group@
;listen.mode = 0660 ;listen.mode = 0660
; When POSIX Access Control Lists are supported you can set them using ; When POSIX Access Control Lists are supported you can set them using
; these options, value is a comma separated list of user/group names. ; these options, value is a comma separated list of user/group names.
; When set, listen.owner and listen.group are ignored ; When set, listen.owner and listen.group are ignored