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
5 ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
7 -;pid = run/php-fpm.pid
8 +pid = /var/run/@processname@.pid
11 ; If it's set to "syslog", log is sent to syslogd instead of being written
13 ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
14 ; Default Value: log/php-fpm.log
15 -;error_log = log/php-fpm.log
16 +error_log = /var/log/php/@processname@.log
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
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
24 ; '/path/to/unix/socket' - to listen on a unix socket.
25 ; Note: This value is mandatory.
26 -listen = 127.0.0.1:9000
27 +listen = /var/run/php/@processname@.sock
29 ; Set listen(2) backlog.
30 ; Default Value: 65535 (-1 on FreeBSD and OpenBSD)
32 ; BSD-derived systems allow connections regardless of permissions.
33 ; Default Values: user and group are set as the running user
35 -;listen.owner = @php_fpm_user@
36 -;listen.group = @php_fpm_group@
39 +listen.group = @php_fpm_group@
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
45 ; must be separated by a comma. If this value is left blank, connections will be
46 ; accepted from any ip address.
48 -;listen.allowed_clients = 127.0.0.1
49 +listen.allowed_clients = 127.0.0.1
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)
54 ; the current environment.
55 ; Default Value: clean env
56 ;env[HOSTNAME] = $HOSTNAME
57 -;env[PATH] = /usr/local/bin:/usr/bin:/bin
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
68 - doc_url.value = location.protocol + '//' + location.host + "/status?json&full";
69 + doc_url.value = location.protocol + '//' + location.host + "/fpm-status?json&full";
71 ths = document.getElementsByTagName("th");
72 for (var i=0; i<ths.length; i++) {
73 --- php7.0-7.0/sapi/fpm/Makefile.frag~ 2015-05-21 17:57:06.000000000 +0300
74 +++ php7.0-7.0/sapi/fpm/Makefile.frag 2015-05-23 11:01:51.383332821 +0300
76 echo "Installing PHP FPM defconfig: skipping"; \
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; \
87 @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"