---- php-5.3.6/sapi/fpm/php-fpm.conf.in 2011-04-22 15:16:07.304822817 +0300
-+++ php-5.3.6/sapi/fpm/php-fpm.conf.in 2011-04-22 15:19:46.991588712 +0300
-@@ -22,7 +22,7 @@
+diff -urNp -x '*.orig' php-7.2.34.org/sapi/fpm/Makefile.frag php-7.2.34/sapi/fpm/Makefile.frag
+--- php-7.2.34.org/sapi/fpm/Makefile.frag 2020-09-30 07:15:50.000000000 +0200
++++ php-7.2.34/sapi/fpm/Makefile.frag 2021-08-24 01:07:47.173245962 +0200
+@@ -14,9 +14,9 @@ install-fpm: $(SAPI_FPM_PATH)
+ echo "Installing PHP FPM defconfig: skipping"; \
+ else \
+ echo "Installing PHP FPM defconfig: $(INSTALL_ROOT)$(sysconfdir)/" && \
+- $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \
+- $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \
+- $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \
++ $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/fpm.d; \
++ $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \
++ $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/fpm.d/www.conf; \
+ fi
+
+ @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"
+diff -urNp -x '*.orig' php-7.2.34.org/sapi/fpm/php-fpm.conf.in php-7.2.34/sapi/fpm/php-fpm.conf.in
+--- php-7.2.34.org/sapi/fpm/php-fpm.conf.in 2020-09-30 07:15:50.000000000 +0200
++++ php-7.2.34/sapi/fpm/php-fpm.conf.in 2021-08-24 01:07:47.169912632 +0200
+@@ -14,14 +14,14 @@
; Pid file
; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
; Default Value: none
-;pid = run/php-fpm.pid
-+pid = /var/run/php/fpm.pid
++pid = /var/run/@processname@.pid
; Error log file
+ ; If it's set to "syslog", log is sent to syslogd instead of being written
+ ; into a local file.
; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
-@@ -93,7 +93,7 @@
- ; specific port;
+ ; Default Value: log/php-fpm.log
+-;error_log = log/php-fpm.log
++error_log = /var/log/php/@processname@.log
+
+ ; syslog_facility is used to specify what type of program is logging the
+ ; message. This lets syslogd specify that messages from different facilities
+diff -urNp -x '*.orig' php-7.2.34.org/sapi/fpm/status.html.in php-7.2.34/sapi/fpm/status.html.in
+--- php-7.2.34.org/sapi/fpm/status.html.in 2020-09-30 07:15:50.000000000 +0200
++++ php-7.2.34/sapi/fpm/status.html.in 2021-08-24 01:07:47.173245962 +0200
+@@ -96,7 +96,7 @@
+ var sort_index;
+ var sort_order;
+
+- doc_url.value = location.protocol + '//' + location.host + "/status?json&full";
++ doc_url.value = location.protocol + '//' + location.host + "/fpm-status?json&full";
+
+ ths = document.getElementsByTagName("th");
+ for (var i=0; i<ths.length; i++) {
+diff -urNp -x '*.orig' php-7.2.34.org/sapi/fpm/www.conf.in php-7.2.34/sapi/fpm/www.conf.in
+--- php-7.2.34.org/sapi/fpm/www.conf.in 2020-09-30 07:15:50.000000000 +0200
++++ php-7.2.34/sapi/fpm/www.conf.in 2021-08-24 01:07:47.169912632 +0200
+@@ -33,7 +33,7 @@ group = @php_fpm_group@
+ ; (IPv6 and IPv4-mapped) on a specific port;
; '/path/to/unix/socket' - to listen on a unix socket.
; Note: This value is mandatory.
-listen = 127.0.0.1:9000
-+listen = /var/run/php/fpm.sock
++listen = /var/run/php/@processname@.sock
- ; Set listen(2) backlog. A value of '-1' means unlimited.
- ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
-@@ -105,7 +105,7 @@
+ ; Set listen(2) backlog.
+ ; Default Value: 511 (-1 on FreeBSD and OpenBSD)
+@@ -44,9 +44,9 @@ listen = 127.0.0.1:9000
+ ; BSD-derived systems allow connections regardless of permissions.
+ ; Default Values: user and group are set as the running user
+ ; mode is set to 0660
+-;listen.owner = @php_fpm_user@
+-;listen.group = @php_fpm_group@
+-;listen.mode = 0660
++listen.owner = root
++listen.group = @php_fpm_group@
++listen.mode = 0660
+ ; When POSIX Access Control Lists are supported you can set them using
+ ; these options, value is a comma separated list of user/group names.
+ ; When set, listen.owner and listen.group are ignored
+@@ -59,7 +59,7 @@ listen = 127.0.0.1:9000
; must be separated by a comma. If this value is left blank, connections will be
; accepted from any ip address.
; Default Value: any
-;listen.allowed_clients = 127.0.0.1
+listen.allowed_clients = 127.0.0.1
- ; Set permissions for unix socket, if one is used. In Linux, read/write
- ; permissions must be set in order to allow connections from a web server. Many
-@@ -277,7 +277,7 @@
+ ; Specify the nice(2) priority to apply to the pool processes (only if set)
+ ; The value can vary from -19 (highest priority) to 20 (lower priority)
+@@ -392,7 +392,7 @@ pm.max_spare_servers = 3
; the current environment.
; Default Value: clean env
;env[HOSTNAME] = $HOSTNAME
projects / packages / php.git / blobdiff