1 --- php-5.3.29/sapi/fpm/php-fpm.conf.in 2014-10-27 07:58:34.296908403 +0200
2 +++ php-5.3.29.old/sapi/fpm/php-fpm.conf.in 2014-10-27 07:46:00.292540344 +0200
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.3.29/sapi/fpm/php-fpm.conf-d.in 2014-10-27 07:54:50.120026865 +0200
21 +++ php-5.3.29.old/sapi/fpm/php-fpm.conf-d.in 2014-10-27 07:46:00.639222822 +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. A value of '-1' means unlimited.
30 ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
32 ; must be separated by a comma. If this value is left blank, connections will be
33 ; accepted from any ip address.
35 -;listen.allowed_clients = 127.0.0.1
36 +listen.allowed_clients = 127.0.0.1
38 ; Specify the nice(2) priority to apply to the pool processes (only if set)
39 ; The value can vary from -19 (highest priority) to 20 (lower priority)
41 ; The desired minimum number of idle server processes.
42 ; Note: Used only when pm is set to 'dynamic'
43 ; Note: Mandatory when pm is set to 'dynamic'
44 -pm.min_spare_servers = 1
45 +pm.min_spare_servers = 2
47 ; The desired maximum number of idle server processes.
48 ; Note: Used only when pm is set to 'dynamic'
49 ; Note: Mandatory when pm is set to 'dynamic'
50 -pm.max_spare_servers = 3
51 +pm.max_spare_servers = 5
53 ; The number of seconds after which an idle process will be killed.
54 ; Note: Used only when pm is set to 'ondemand'
56 ; anything, but it may not be a good idea to use the .php extension or it
57 ; may conflict with a real PHP file.
58 ; Default Value: not set
59 -;pm.status_path = /status
60 +;pm.status_path = /fpm-status
62 ; The ping URI to call the monitoring page of FPM. If this value is not set, no
63 ; URI will be recognized as a ping page. This could be used to test from outside
65 ; Note: on highloaded environement, this can cause some delay in the page
66 ; process time (several ms).
68 -;catch_workers_output = yes
69 +catch_workers_output = yes
71 ; Limits the extensions of the main script FPM will allow to parse. This can
72 ; prevent configuration mistakes on the web server side. You should only limit
74 ; the current environment.
75 ; Default Value: clean env
76 ;env[HOSTNAME] = $HOSTNAME
77 -;env[PATH] = /usr/local/bin:/usr/bin:/bin
82 --- php-5.3.9/sapi/fpm/status.html.in~ 2011-10-08 23:43:12.000000000 +0300
83 +++ php-5.3.9/sapi/fpm/status.html.in 2012-01-12 02:19:09.573191879 +0200
88 - doc_url.value = location.protocol + '//' + location.host + "/status?json&full";
89 + doc_url.value = location.protocol + '//' + location.host + "/fpm-status?json&full";
91 ths = document.getElementsByTagName("th");
92 for (var i=0; i<ths.length; i++) {
93 --- php-5.3.29/sapi/fpm/Makefile.frag~ 2014-10-27 07:57:09.000000000 +0200
94 +++ php-5.3.29/sapi/fpm/Makefile.frag 2014-10-27 07:57:29.523957175 +0200
96 @echo "Installing PHP FPM config: $(INSTALL_ROOT)$(sysconfdir)/" && \
97 $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/fpm.d || :
99 - @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || :
100 + @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf || :
101 @$(INSTALL_DATA) sapi/fpm/php-fpm.conf-d $(INSTALL_ROOT)$(sysconfdir)/fpm.d/www.conf || :
103 @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"