projects / packages / php.git / blame
| Commit | Line | Data |
|---|---|---|
| 562cdd31 JR |
1 | diff -urNp -x '*.orig' php-7.2.34.org/sapi/fpm/Makefile.frag php-7.2.34/sapi/fpm/Makefile.frag |
| 2 | --- php-7.2.34.org/sapi/fpm/Makefile.frag 2020-09-30 07:15:50.000000000 +0200 | |
| 3 | +++ php-7.2.34/sapi/fpm/Makefile.frag 2021-08-24 01:07:47.173245962 +0200 | |
| 4 | @@ -14,9 +14,9 @@ install-fpm: $(SAPI_FPM_PATH) | |
| 5 | echo "Installing PHP FPM defconfig: skipping"; \ | |
| 6 | else \ | |
| 7 | echo "Installing PHP FPM defconfig: $(INSTALL_ROOT)$(sysconfdir)/" && \ | |
| 8 | - $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \ | |
| 9 | - $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \ | |
| 10 | - $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \ | |
| 11 | + $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/fpm.d; \ | |
| 12 | + $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \ | |
| 13 | + $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/fpm.d/www.conf; \ | |
| 14 | fi | |
| 15 | ||
| 16 | @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/" | |
| 17 | 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 | |
| 18 | --- php-7.2.34.org/sapi/fpm/php-fpm.conf.in 2020-09-30 07:15:50.000000000 +0200 | |
| 19 | +++ php-7.2.34/sapi/fpm/php-fpm.conf.in 2021-08-24 01:07:47.169912632 +0200 | |
| 8851ace1 | 20 | @@ -14,14 +14,14 @@ |
| c0240cb1 | 21 | ; Pid file |
| 22 | ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ | |
| 23 | ; Default Value: none | |
| 24 | -;pid = run/php-fpm.pid | |
| d936e544 | 25 | +pid = /var/run/@processname@.pid |
| c0240cb1 | 26 | |
| 27 | ; Error log file | |
| d307ed78 | 28 | ; If it's set to "syslog", log is sent to syslogd instead of being written |
| 2955e38d | 29 | ; into a local file. |
| c0240cb1 | 30 | ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ |
| d307ed78 ER |
31 | ; Default Value: log/php-fpm.log |
| 32 | -;error_log = log/php-fpm.log | |
| 3263298d | 33 | +error_log = /var/log/php/@processname@.log |
| d307ed78 ER |
34 | |
| 35 | ; syslog_facility is used to specify what type of program is logging the | |
| 36 | ; message. This lets syslogd specify that messages from different facilities | |
| 562cdd31 JR |
37 | diff -urNp -x '*.orig' php-7.2.34.org/sapi/fpm/status.html.in php-7.2.34/sapi/fpm/status.html.in |
| 38 | --- php-7.2.34.org/sapi/fpm/status.html.in 2020-09-30 07:15:50.000000000 +0200 | |
| 39 | +++ php-7.2.34/sapi/fpm/status.html.in 2021-08-24 01:07:47.173245962 +0200 | |
| 40 | @@ -96,7 +96,7 @@ | |
| 41 | var sort_index; | |
| 42 | var sort_order; | |
| 43 | ||
| 44 | - doc_url.value = location.protocol + '//' + location.host + "/status?json&full"; | |
| 45 | + doc_url.value = location.protocol + '//' + location.host + "/fpm-status?json&full"; | |
| 46 | ||
| 47 | ths = document.getElementsByTagName("th"); | |
| 48 | for (var i=0; i<ths.length; i++) { | |
| 49 | diff -urNp -x '*.orig' php-7.2.34.org/sapi/fpm/www.conf.in php-7.2.34/sapi/fpm/www.conf.in | |
| 50 | --- php-7.2.34.org/sapi/fpm/www.conf.in 2020-09-30 07:15:50.000000000 +0200 | |
| 51 | +++ php-7.2.34/sapi/fpm/www.conf.in 2021-08-24 01:07:47.169912632 +0200 | |
| 52 | @@ -33,7 +33,7 @@ group = @php_fpm_group@ | |
| 53 | ; (IPv6 and IPv4-mapped) on a specific port; | |
| c0240cb1 | 54 | ; '/path/to/unix/socket' - to listen on a unix socket. |
| 55 | ; Note: This value is mandatory. | |
| 56 | -listen = 127.0.0.1:9000 | |
| cbcd3660 | 57 | +listen = /var/run/php/@processname@.sock |
| c0240cb1 | 58 | |
| 8851ace1 | 59 | ; Set listen(2) backlog. |
| 562cdd31 JR |
60 | ; Default Value: 511 (-1 on FreeBSD and OpenBSD) |
| 61 | @@ -44,9 +44,9 @@ listen = 127.0.0.1:9000 | |
| 62 | ; BSD-derived systems allow connections regardless of permissions. | |
| 72f7881d ER |
63 | ; Default Values: user and group are set as the running user |
| 64 | ; mode is set to 0660 | |
| 65 | -;listen.owner = @php_fpm_user@ | |
| 66 | -;listen.group = @php_fpm_group@ | |
| 67 | -;listen.mode = 0660 | |
| 68 | +listen.owner = root | |
| 69 | +listen.group = @php_fpm_group@ | |
| 70 | +listen.mode = 0660 | |
| f7b16851 ER |
71 | ; When POSIX Access Control Lists are supported you can set them using |
| 72 | ; these options, value is a comma separated list of user/group names. | |
| 73 | ; When set, listen.owner and listen.group are ignored | |
| 562cdd31 | 74 | @@ -59,7 +59,7 @@ listen = 127.0.0.1:9000 |
| c0240cb1 | 75 | ; must be separated by a comma. If this value is left blank, connections will be |
| 76 | ; accepted from any ip address. | |
| 77 | ; Default Value: any | |
| 78 | -;listen.allowed_clients = 127.0.0.1 | |
| 79 | +listen.allowed_clients = 127.0.0.1 | |
| 80 | ||
| 8851ace1 ER |
81 | ; Specify the nice(2) priority to apply to the pool processes (only if set) |
| 82 | ; The value can vary from -19 (highest priority) to 20 (lower priority) | |
| 562cdd31 | 83 | @@ -392,7 +392,7 @@ pm.max_spare_servers = 3 |
| c0240cb1 | 84 | ; the current environment. |
| 85 | ; Default Value: clean env | |
| 86 | ;env[HOSTNAME] = $HOSTNAME | |
| 87 | -;env[PATH] = /usr/local/bin:/usr/bin:/bin | |
| 88 | +env[PATH] = $PATH | |
| 89 | ;env[TMP] = /tmp | |
| 90 | ;env[TMPDIR] = /tmp | |
| 91 | ;env[TEMP] = /tmp |