]>
Commit | Line | Data |
---|---|---|
bbdccbb0 ER |
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 | |
3 | @@ -14,14 +15,14 @@ | |
a75ee3d7 JP |
4 | ; Pid file |
5 | ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ | |
6 | ; Default Value: none | |
7 | -;pid = run/php-fpm.pid | |
5151b487 | 8 | +pid = /var/run/@processname@.pid |
a75ee3d7 JP |
9 | |
10 | ; Error log file | |
3a3c0140 | 11 | ; If it's set to "syslog", log is sent to syslogd instead of being written |
476c5172 ER |
12 | ; in a local file. |
13 | ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ | |
14 | ; Default Value: log/php-fpm.log | |
15 | -;error_log = log/php-fpm.log | |
5252d933 | 16 | +error_log = /var/log/php/@processname@.log |
476c5172 ER |
17 | |
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 | |
80b97147 ER |
20 | --- php-5.3.29.old/sapi/fpm/php-fpm.conf-d.in 2014-10-27 07:46:00.639222822 +0200 |
21 | +++ php-5.3.29/sapi/fpm/php-fpm.conf-d.in 2014-10-27 08:02:11.543472244 +0200 | |
bbdccbb0 | 22 | @@ -30,7 +30,7 @@ |
52ca5276 ER |
23 | ; 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 | |
cdbeb446 | 27 | +listen = /var/run/php/@processname@.sock |
52ca5276 ER |
28 | |
29 | ; Set listen(2) backlog. A value of '-1' means unlimited. | |
30 | ; Default Value: 128 (-1 on FreeBSD and OpenBSD) | |
80b97147 ER |
31 | @@ -41,9 +41,9 @@ |
32 | ; BSD-derived systems allow connections regardless of permissions. | |
33 | ; Default Values: user and group are set as the running user | |
34 | ; mode is set to 0660 | |
35 | -;listen.owner = @php_fpm_user@ | |
36 | -;listen.group = @php_fpm_group@ | |
37 | -;listen.mode = 0660 | |
38 | +listen.owner = root | |
39 | +listen.group = @php_fpm_group@ | |
40 | +listen.mode = 0660 | |
41 | ||
42 | ; List of ipv4 addresses of FastCGI clients which are allowed to connect. | |
43 | ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original | |
bbdccbb0 | 44 | @@ -51,7 +51,7 @@ |
b5727ab6 ER |
45 | ; must be separated by a comma. If this value is left blank, connections will be |
46 | ; accepted from any ip address. | |
47 | ; Default Value: any | |
48 | -;listen.allowed_clients = 127.0.0.1 | |
49 | +listen.allowed_clients = 127.0.0.1 | |
50 | ||
bbdccbb0 ER |
51 | ; Specify the nice(2) priority to apply to the pool processes (only if set) |
52 | ; The value can vary from -19 (highest priority) to 20 (lower priority) | |
53 | @@ -106,12 +106,12 @@ | |
a75ee3d7 JP |
54 | ; The desired minimum number of idle server processes. |
55 | ; Note: Used only when pm is set to 'dynamic' | |
56 | ; Note: Mandatory when pm is set to 'dynamic' | |
6d7958ec ER |
57 | -pm.min_spare_servers = 1 |
58 | +pm.min_spare_servers = 2 | |
a75ee3d7 JP |
59 | |
60 | ; The desired maximum number of idle server processes. | |
61 | ; Note: Used only when pm is set to 'dynamic' | |
62 | ; Note: Mandatory when pm is set to 'dynamic' | |
6d7958ec ER |
63 | -pm.max_spare_servers = 3 |
64 | +pm.max_spare_servers = 5 | |
65 | ||
66 | ; The number of seconds after which an idle process will be killed. | |
67 | ; Note: Used only when pm is set to 'ondemand' | |
bbdccbb0 | 68 | @@ -221,7 +221,7 @@ |
83e9cbb3 ER |
69 | ; anything, but it may not be a good idea to use the .php extension or it |
70 | ; may conflict with a real PHP file. | |
71 | ; Default Value: not set | |
72 | -;pm.status_path = /status | |
73 | +;pm.status_path = /fpm-status | |
74 | ||
75 | ; The ping URI to call the monitoring page of FPM. If this value is not set, no | |
76 | ; URI will be recognized as a ping page. This could be used to test from outside | |
bbdccbb0 | 77 | @@ -347,7 +347,7 @@ |
80f70dba ER |
78 | ; Note: on highloaded environement, this can cause some delay in the page |
79 | ; process time (several ms). | |
80 | ; Default Value: no | |
81 | -;catch_workers_output = yes | |
82 | +catch_workers_output = yes | |
83 | ||
84 | ; Limits the extensions of the main script FPM will allow to parse. This can | |
85 | ; prevent configuration mistakes on the web server side. You should only limit | |
bbdccbb0 | 86 | @@ -361,7 +361,7 @@ |
86a42589 ER |
87 | ; the current environment. |
88 | ; Default Value: clean env | |
89 | ;env[HOSTNAME] = $HOSTNAME | |
90 | -;env[PATH] = /usr/local/bin:/usr/bin:/bin | |
91 | +env[PATH] = $PATH | |
92 | ;env[TMP] = /tmp | |
93 | ;env[TMPDIR] = /tmp | |
94 | ;env[TEMP] = /tmp | |
57727ccf ER |
95 | --- php-5.3.9/sapi/fpm/status.html.in~ 2011-10-08 23:43:12.000000000 +0300 |
96 | +++ php-5.3.9/sapi/fpm/status.html.in 2012-01-12 02:19:09.573191879 +0200 | |
97 | @@ -96,7 +96,7 @@ | |
98 | var sort_index; | |
99 | var sort_order; | |
100 | ||
101 | - doc_url.value = location.protocol + '//' + location.host + "/status?json&full"; | |
102 | + doc_url.value = location.protocol + '//' + location.host + "/fpm-status?json&full"; | |
103 | ||
104 | ths = document.getElementsByTagName("th"); | |
105 | for (var i=0; i<ths.length; i++) { | |
bbdccbb0 ER |
106 | --- php-5.3.29/sapi/fpm/Makefile.frag~ 2014-10-27 07:57:09.000000000 +0200 |
107 | +++ php-5.3.29/sapi/fpm/Makefile.frag 2014-10-27 07:57:29.523957175 +0200 | |
57727ccf ER |
108 | @@ -21,7 +21,7 @@ |
109 | @echo "Installing PHP FPM config: $(INSTALL_ROOT)$(sysconfdir)/" && \ | |
bbdccbb0 | 110 | $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/fpm.d || : |
57727ccf ER |
111 | |
112 | - @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || : | |
113 | + @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf || : | |
bbdccbb0 | 114 | @$(INSTALL_DATA) sapi/fpm/php-fpm.conf-d $(INSTALL_ROOT)$(sysconfdir)/fpm.d/www.conf || : |
57727ccf ER |
115 | |
116 | @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/" |