1 --- php-5.3.17/sapi/fpm/php-fpm.conf.in~ 2012-09-13 00:27:16.000000000 +0300
2 +++ php-5.3.17/sapi/fpm/php-fpm.conf.in 2012-10-09 20:00:31.645362454 +0300
5 ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
7 -;pid = run/php-fpm.pid
8 +pid = /var/run/php/@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 = log/@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
22 ; '/path/to/unix/socket' - to listen on a unix socket.
23 ; Note: This value is mandatory.
24 -listen = 127.0.0.1:9000
25 +listen = /var/run/php/@processname@.sock
27 ; Set listen(2) backlog. A value of '-1' means unlimited.
28 ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
30 ; must be separated by a comma. If this value is left blank, connections will be
31 ; accepted from any ip address.
33 -;listen.allowed_clients = 127.0.0.1
34 +listen.allowed_clients = 127.0.0.1
36 ; Choose how the process manager will control the number of child processes.
39 ; The desired minimum number of idle server processes.
40 ; Note: Used only when pm is set to 'dynamic'
41 ; Note: Mandatory when pm is set to 'dynamic'
42 -pm.min_spare_servers = 1
43 +pm.min_spare_servers = 2
45 ; The desired maximum number of idle server processes.
46 ; Note: Used only when pm is set to 'dynamic'
47 ; Note: Mandatory when pm is set to 'dynamic'
48 -pm.max_spare_servers = 3
49 +pm.max_spare_servers = 5
51 ; The number of seconds after which an idle process will be killed.
52 ; Note: Used only when pm is set to 'ondemand'
54 ; anything, but it may not be a good idea to use the .php extension or it
55 ; may conflict with a real PHP file.
56 ; Default Value: not set
57 -;pm.status_path = /status
58 +;pm.status_path = /fpm-status
60 ; The ping URI to call the monitoring page of FPM. If this value is not set, no
61 ; URI will be recognized as a ping page. This could be used to test from outside
63 ; Note: on highloaded environement, this can cause some delay in the page
64 ; process time (several ms).
66 -;catch_workers_output = yes
67 +catch_workers_output = yes
69 ; Limits the extensions of the main script FPM will allow to parse. This can
70 ; prevent configuration mistakes on the web server side. You should only limit
72 ; the current environment.
73 ; Default Value: clean env
74 ;env[HOSTNAME] = $HOSTNAME
75 -;env[PATH] = /usr/local/bin:/usr/bin:/bin
80 --- php-5.3.9/sapi/fpm/status.html.in~ 2011-10-08 23:43:12.000000000 +0300
81 +++ php-5.3.9/sapi/fpm/status.html.in 2012-01-12 02:19:09.573191879 +0200
86 - doc_url.value = location.protocol + '//' + location.host + "/status?json&full";
87 + doc_url.value = location.protocol + '//' + location.host + "/fpm-status?json&full";
89 ths = document.getElementsByTagName("th");
90 for (var i=0; i<ths.length; i++) {
91 --- php-5.3.9/sapi/fpm/Makefile.frag~ 2012-01-11 21:49:42.000000000 +0200
92 +++ php-5.3.9/sapi/fpm/Makefile.frag 2012-01-12 02:20:25.553355153 +0200
94 @echo "Installing PHP FPM config: $(INSTALL_ROOT)$(sysconfdir)/" && \
95 $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir) || :
97 - @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || :
98 + @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf || :
100 @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"
101 @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8