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