projects / packages / php.git / blame
| Commit | Line | Data |
|---|---|---|
| 3a3c0140 ER |
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 | |
| a75ee3d7 JP |
3 | @@ -22,7 +22,7 @@ |
| 4 | ; Pid file | |
| 5 | ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ | |
| 6 | ; Default Value: none | |
| 7 | -;pid = run/php-fpm.pid | |
| cdbeb446 | 8 | +pid = /var/run/php/@processname@.pid |
| a75ee3d7 JP |
9 | |
| 10 | ; Error log file | |
| 3a3c0140 ER |
11 | ; If it's set to "syslog", log is sent to syslogd instead of being written |
| 12 | @@ -140,7 +140,7 @@ | |
| 52ca5276 ER |
13 | ; specific port; |
| 14 | ; '/path/to/unix/socket' - to listen on a unix socket. | |
| 15 | ; Note: This value is mandatory. | |
| 16 | -listen = 127.0.0.1:9000 | |
| cdbeb446 | 17 | +listen = /var/run/php/@processname@.sock |
| 52ca5276 ER |
18 | |
| 19 | ; Set listen(2) backlog. A value of '-1' means unlimited. | |
| 20 | ; Default Value: 128 (-1 on FreeBSD and OpenBSD) | |
| 3a3c0140 | 21 | @@ -161,7 +161,7 @@ |
| b5727ab6 ER |
22 | ; must be separated by a comma. If this value is left blank, connections will be |
| 23 | ; accepted from any ip address. | |
| 24 | ; Default Value: any | |
| 25 | -;listen.allowed_clients = 127.0.0.1 | |
| 26 | +listen.allowed_clients = 127.0.0.1 | |
| 27 | ||
| 3a3c0140 ER |
28 | ; Choose how the process manager will control the number of child processes. |
| 29 | ; Possible Values: | |
| 6d7958ec | 30 | @@ -208,12 +208,12 @@ |
| a75ee3d7 JP |
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' | |
| 6d7958ec ER |
34 | -pm.min_spare_servers = 1 |
| 35 | +pm.min_spare_servers = 2 | |
| a75ee3d7 JP |
36 | |
| 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' | |
| 6d7958ec ER |
40 | -pm.max_spare_servers = 3 |
| 41 | +pm.max_spare_servers = 5 | |
| 42 | ||
| 43 | ; The number of seconds after which an idle process will be killed. | |
| 44 | ; Note: Used only when pm is set to 'ondemand' | |
| 3a3c0140 | 45 | @@ -323,7 +323,7 @@ |
| 83e9cbb3 ER |
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 | |
| 51 | ||
| 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 | |
| 80f70dba ER |
54 | @@ -449,7 +449,7 @@ |
| 55 | ; Note: on highloaded environement, this can cause some delay in the page | |
| 56 | ; process time (several ms). | |
| 57 | ; Default Value: no | |
| 58 | -;catch_workers_output = yes | |
| 59 | +catch_workers_output = yes | |
| 60 | ||
| 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 | |
| 3a3c0140 | 63 | @@ -463,7 +463,7 @@ |
| 86a42589 ER |
64 | ; the current environment. |
| 65 | ; Default Value: clean env | |
| 66 | ;env[HOSTNAME] = $HOSTNAME | |
| 67 | -;env[PATH] = /usr/local/bin:/usr/bin:/bin | |
| 68 | +env[PATH] = $PATH | |
| 69 | ;env[TMP] = /tmp | |
| 70 | ;env[TMPDIR] = /tmp | |
| 71 | ;env[TEMP] = /tmp | |
| 57727ccf ER |
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 | |
| 74 | @@ -96,7 +96,7 @@ | |
| 75 | var sort_index; | |
| 76 | var sort_order; | |
| 77 | ||
| 78 | - doc_url.value = location.protocol + '//' + location.host + "/status?json&full"; | |
| 79 | + doc_url.value = location.protocol + '//' + location.host + "/fpm-status?json&full"; | |
| 80 | ||
| 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 | |
| 85 | @@ -21,7 +21,7 @@ | |
| 86 | @echo "Installing PHP FPM config: $(INSTALL_ROOT)$(sysconfdir)/" && \ | |
| 87 | $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir) || : | |
| 88 | ||
| 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 || : | |
| 91 | ||
| 92 | @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/" | |
| 93 | @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8 |