1 --- php-5.4.7/sapi/fpm/php-fpm.conf.in 2012-10-05 22:16:44.895998479 +0300
2 +++ php-5.3.17/sapi/fpm/php-fpm.conf.in 2012-10-12 12:35:47.601602945 +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.5.25/sapi/fpm/php-fpm.conf-d.in~ 2015-05-22 07:21:41.000000000 +0300
21 +++ php-5.5.25/sapi/fpm/php-fpm.conf-d.in 2015-05-22 07:24:22.913173238 +0300
23 ; (IPv6 and IPv4-mapped) on a specific port;
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 = 127.0.0.1:9000
28 +listen = /var/run/php/@processname@.sock
30 ; Set listen(2) backlog.
31 ; Default Value: 65535 (-1 on FreeBSD and OpenBSD)
33 ; must be separated by a comma. If this value is left blank, connections will be
34 ; accepted from any ip address.
36 -;listen.allowed_clients = 127.0.0.1
37 +listen.allowed_clients = 127.0.0.1
39 ; Specify the nice(2) priority to apply to the pool processes (only if set)
40 ; The value can vary from -19 (highest priority) to 20 (lower priority)
42 ; the current environment.
43 ; Default Value: clean env
44 ;env[HOSTNAME] = $HOSTNAME
45 -;env[PATH] = /usr/local/bin:/usr/bin:/bin
50 --- php-5.5.25/sapi/fpm/Makefile.frag~ 2015-05-22 07:35:13.000000000 +0300
51 +++ php-5.5.25/sapi/fpm/Makefile.frag 2015-05-22 07:35:35.001377912 +0300
54 @echo "Installing PHP FPM config: $(INSTALL_ROOT)$(sysconfdir)/" && \
55 $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/fpm.d || :
56 - @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || :
57 - @$(INSTALL_DATA) sapi/fpm/php-fpm.conf-d $(INSTALL_ROOT)$(sysconfdir)/fpm.d/www.conf.default || :
58 + @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf || :
59 + @$(INSTALL_DATA) sapi/fpm/php-fpm.conf-d $(INSTALL_ROOT)$(sysconfdir)/fpm.d/www.conf || :
61 @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"
62 @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8
63 --- php-5.3.9/sapi/fpm/status.html.in~ 2011-10-08 23:43:12.000000000 +0300
64 +++ php-5.3.9/sapi/fpm/status.html.in 2012-01-12 02:19:09.573191879 +0200
69 - doc_url.value = location.protocol + '//' + location.host + "/status?json&full";
70 + doc_url.value = location.protocol + '//' + location.host + "/fpm-status?json&full";
72 ths = document.getElementsByTagName("th");
73 for (var i=0; i<ths.length; i++) {