1 --- php-5.3.17/sapi/fpm/php-fpm.conf.in 2012-10-12 12:35:47.601602945 +0300
2 +++ php-5.3.18/sapi/fpm/php-fpm.conf.in 2012-11-28 15:31:00.486871136 +0200
9 ; Relative path can also be used. They will be prefixed by:
10 ; - the global prefix if it's been set (-p arguement)
11 ; - @prefix@ otherwise
12 -;include=etc/fpm.d/*.conf
13 +;include=/etc/php/fpm.d/*.conf
19 ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
21 -;pid = run/php-fpm.pid
22 +pid = /var/run/@processname@.pid
25 ; If it's set to "syslog", log is sent to syslogd instead of being written
27 ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
28 ; Default Value: log/php-fpm.log
29 -;error_log = log/php-fpm.log
30 +error_log = /var/log/php/@processname@.log
32 ; syslog_facility is used to specify what type of program is logging the
33 ; message. This lets syslogd specify that messages from different facilities
36 ; '/path/to/unix/socket' - to listen on a unix socket.
37 ; Note: This value is mandatory.
38 -listen = 127.0.0.1:9000
39 +listen = /var/run/php/@processname@.sock
41 ; Set listen(2) backlog. A value of '-1' means unlimited.
42 ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
44 ; must be separated by a comma. If this value is left blank, connections will be
45 ; accepted from any ip address.
47 -;listen.allowed_clients = 127.0.0.1
48 +listen.allowed_clients = 127.0.0.1
50 ; Choose how the process manager will control the number of child processes.
53 ; The desired minimum number of idle server processes.
54 ; Note: Used only when pm is set to 'dynamic'
55 ; Note: Mandatory when pm is set to 'dynamic'
56 -pm.min_spare_servers = 1
57 +pm.min_spare_servers = 2
59 ; The desired maximum number of idle server processes.
60 ; Note: Used only when pm is set to 'dynamic'
61 ; Note: Mandatory when pm is set to 'dynamic'
62 -pm.max_spare_servers = 3
63 +pm.max_spare_servers = 5
65 ; The number of seconds after which an idle process will be killed.
66 ; Note: Used only when pm is set to 'ondemand'
68 ; anything, but it may not be a good idea to use the .php extension or it
69 ; may conflict with a real PHP file.
70 ; Default Value: not set
71 -;pm.status_path = /status
72 +;pm.status_path = /fpm-status
74 ; The ping URI to call the monitoring page of FPM. If this value is not set, no
75 ; URI will be recognized as a ping page. This could be used to test from outside
77 ; Note: on highloaded environement, this can cause some delay in the page
78 ; process time (several ms).
80 -;catch_workers_output = yes
81 +catch_workers_output = yes
83 ; Limits the extensions of the main script FPM will allow to parse. This can
84 ; prevent configuration mistakes on the web server side. You should only limit
86 ; the current environment.
87 ; Default Value: clean env
88 ;env[HOSTNAME] = $HOSTNAME
89 -;env[PATH] = /usr/local/bin:/usr/bin:/bin
94 --- php-5.3.9/sapi/fpm/status.html.in~ 2011-10-08 23:43:12.000000000 +0300
95 +++ php-5.3.9/sapi/fpm/status.html.in 2012-01-12 02:19:09.573191879 +0200
100 - doc_url.value = location.protocol + '//' + location.host + "/status?json&full";
101 + doc_url.value = location.protocol + '//' + location.host + "/fpm-status?json&full";
103 ths = document.getElementsByTagName("th");
104 for (var i=0; i<ths.length; i++) {
105 --- php-5.3.9/sapi/fpm/Makefile.frag~ 2012-01-11 21:49:42.000000000 +0200
106 +++ php-5.3.9/sapi/fpm/Makefile.frag 2012-01-12 02:20:25.553355153 +0200
108 @echo "Installing PHP FPM config: $(INSTALL_ROOT)$(sysconfdir)/" && \
109 $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir) || :
111 - @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || :
112 + @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf || :
114 @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"
115 @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8