1 diff -urNp -x '*.orig' php-5.6.40.org/sapi/fpm/Makefile.frag php-5.6.40/sapi/fpm/Makefile.frag
2 --- php-5.6.40.org/sapi/fpm/Makefile.frag 2021-08-23 23:19:50.029101357 +0200
3 +++ php-5.6.40/sapi/fpm/Makefile.frag 2021-08-23 23:19:51.305766688 +0200
4 @@ -12,8 +12,8 @@ install-fpm: $(SAPI_FPM_PATH)
6 @echo "Installing PHP FPM config: $(INSTALL_ROOT)$(sysconfdir)/" && \
7 $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/fpm.d || :
8 - @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || :
9 - @$(INSTALL_DATA) sapi/fpm/php-fpm.conf-d $(INSTALL_ROOT)$(sysconfdir)/fpm.d/www.conf.default || :
10 + @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf || :
11 + @$(INSTALL_DATA) sapi/fpm/php-fpm.conf-d $(INSTALL_ROOT)$(sysconfdir)/fpm.d/www.conf || :
13 @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"
14 @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8
15 diff -urNp -x '*.orig' php-5.6.40.org/sapi/fpm/php-fpm.conf-d.in php-5.6.40/sapi/fpm/php-fpm.conf-d.in
16 --- php-5.6.40.org/sapi/fpm/php-fpm.conf-d.in 2021-08-23 23:19:50.029101357 +0200
17 +++ php-5.6.40/sapi/fpm/php-fpm.conf-d.in 2021-08-23 23:19:51.305766688 +0200
18 @@ -35,7 +35,7 @@ group = @php_fpm_group@
19 ; (IPv6 and IPv4-mapped) on a specific port;
20 ; '/path/to/unix/socket' - to listen on a unix socket.
21 ; Note: This value is mandatory.
22 -listen = 127.0.0.1:9000
23 +listen = /var/run/php/@processname@.sock
25 ; Set listen(2) backlog.
26 ; Default Value: 65535 (-1 on FreeBSD and OpenBSD)
27 @@ -46,9 +46,9 @@ listen = 127.0.0.1:9000
28 ; BSD-derived systems allow connections regardless of permissions.
29 ; Default Values: user and group are set as the running user
31 -;listen.owner = @php_fpm_user@
32 -;listen.group = @php_fpm_group@
35 +listen.group = @php_fpm_group@
37 ; When POSIX Access Control Lists are supported you can set them using
38 ; these options, value is a comma separated list of user/group names.
39 ; When set, listen.owner and listen.group are ignored
40 @@ -61,7 +61,7 @@ listen = 127.0.0.1:9000
41 ; must be separated by a comma. If this value is left blank, connections will be
42 ; accepted from any ip address.
44 -;listen.allowed_clients = 127.0.0.1
45 +listen.allowed_clients = 127.0.0.1
47 ; Specify the nice(2) priority to apply to the pool processes (only if set)
48 ; The value can vary from -19 (highest priority) to 20 (lower priority)
49 @@ -386,7 +386,7 @@ pm.max_spare_servers = 3
50 ; the current environment.
51 ; Default Value: clean env
52 ;env[HOSTNAME] = $HOSTNAME
53 -;env[PATH] = /usr/local/bin:/usr/bin:/bin
58 diff -urNp -x '*.orig' php-5.6.40.org/sapi/fpm/php-fpm.conf.in php-5.6.40/sapi/fpm/php-fpm.conf.in
59 --- php-5.6.40.org/sapi/fpm/php-fpm.conf.in 2021-08-23 23:19:50.029101357 +0200
60 +++ php-5.6.40/sapi/fpm/php-fpm.conf.in 2021-08-23 23:19:51.305766688 +0200
63 ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
65 -;pid = run/php-fpm.pid
66 +pid = /var/run/@processname@.pid
69 ; If it's set to "syslog", log is sent to syslogd instead of being written
71 ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
72 ; Default Value: log/php-fpm.log
73 -;error_log = log/php-fpm.log
74 +error_log = /var/log/php/@processname@.log
76 ; syslog_facility is used to specify what type of program is logging the
77 ; message. This lets syslogd specify that messages from different facilities
79 ; used in logs and stats. There is no limitation on the number of pools which
80 ; FPM can handle. Your system will tell you anyway :)
82 +; Include one or more files. If glob(3) exists, it is used to include a bunch of
83 +; files from a glob(3) pattern. This directive can be used everywhere in the
85 +; Relative path can also be used. They will be prefixed by:
86 +; - the global prefix if it's been set (-p argument)
87 +; - @prefix@ otherwise
88 +include=/etc/php/fpm.d/*.conf
89 diff -urNp -x '*.orig' php-5.6.40.org/sapi/fpm/status.html.in php-5.6.40/sapi/fpm/status.html.in
90 --- php-5.6.40.org/sapi/fpm/status.html.in 2019-01-09 10:54:13.000000000 +0100
91 +++ php-5.6.40/sapi/fpm/status.html.in 2021-08-23 23:19:51.305766688 +0200
96 - doc_url.value = location.protocol + '//' + location.host + "/status?json&full";
97 + doc_url.value = location.protocol + '//' + location.host + "/fpm-status?json&full";
99 ths = document.getElementsByTagName("th");
100 for (var i=0; i<ths.length; i++) {