1 --- php-5.3.14/sapi/fpm/php-fpm.conf.in~ 2012-06-13 11:18:44.000000000 +0300
2 +++ php-5.3.14/sapi/fpm/php-fpm.conf.in 2012-07-12 15:38:49.056368781 +0300
5 ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
7 -;pid = run/php-fpm.pid
8 +pid = /var/run/php/fpm.pid
11 ; If it's set to "syslog", log is sent to syslogd instead of being written
14 ; '/path/to/unix/socket' - to listen on a unix socket.
15 ; Note: This value is mandatory.
16 -listen = 127.0.0.1:9000
17 +listen = /var/run/php/fpm.sock
19 ; Set listen(2) backlog. A value of '-1' means unlimited.
20 ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
22 ; must be separated by a comma. If this value is left blank, connections will be
23 ; accepted from any ip address.
25 -;listen.allowed_clients = 127.0.0.1
26 +listen.allowed_clients = 127.0.0.1
28 ; Choose how the process manager will control the number of child processes.
31 ; The desired minimum number of idle server processes.
32 ; Note: Used only when pm is set to 'dynamic'
33 ; Note: Mandatory when pm is set to 'dynamic'
34 -pm.min_spare_servers = 1
35 +pm.min_spare_servers = 2
37 ; The desired maximum number of idle server processes.
38 ; Note: Used only when pm is set to 'dynamic'
39 ; Note: Mandatory when pm is set to 'dynamic'
40 -pm.max_spare_servers = 3
41 +pm.max_spare_servers = 5
43 ; The number of seconds after which an idle process will be killed.
44 ; Note: Used only when pm is set to 'ondemand'
46 ; anything, but it may not be a good idea to use the .php extension or it
47 ; may conflict with a real PHP file.
48 ; Default Value: not set
49 -;pm.status_path = /status
50 +;pm.status_path = /fpm-status
52 ; The ping URI to call the monitoring page of FPM. If this value is not set, no
53 ; URI will be recognized as a ping page. This could be used to test from outside
55 ; Note: on highloaded environement, this can cause some delay in the page
56 ; process time (several ms).
58 -;catch_workers_output = yes
59 +catch_workers_output = yes
61 ; Limits the extensions of the main script FPM will allow to parse. This can
62 ; prevent configuration mistakes on the web server side. You should only limit
64 ; the current environment.
65 ; Default Value: clean env
66 ;env[HOSTNAME] = $HOSTNAME
67 -;env[PATH] = /usr/local/bin:/usr/bin:/bin
72 --- php-5.3.9/sapi/fpm/status.html.in~ 2011-10-08 23:43:12.000000000 +0300
73 +++ php-5.3.9/sapi/fpm/status.html.in 2012-01-12 02:19:09.573191879 +0200
78 - doc_url.value = location.protocol + '//' + location.host + "/status?json&full";
79 + doc_url.value = location.protocol + '//' + location.host + "/fpm-status?json&full";
81 ths = document.getElementsByTagName("th");
82 for (var i=0; i<ths.length; i++) {
83 --- php-5.3.9/sapi/fpm/Makefile.frag~ 2012-01-11 21:49:42.000000000 +0200
84 +++ php-5.3.9/sapi/fpm/Makefile.frag 2012-01-12 02:20:25.553355153 +0200
86 @echo "Installing PHP FPM config: $(INSTALL_ROOT)$(sysconfdir)/" && \
87 $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir) || :
89 - @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || :
90 + @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf || :
92 @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"
93 @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8