---- php-5.2.6/sapi/cgi/fpm/conf/php-fpm.conf.in 2008-11-16 17:30:12.321010353 +0200
-+++ php-5.2.9/sapi/cgi/fpm/conf/php-fpm.conf.in 2009-06-12 10:24:54.843655130 +0300
-@@ -38,7 +38,7 @@
-
- Address to accept fastcgi requests on.
- Valid syntax is 'ip.ad.re.ss:port' or just 'port' or '/path/to/unix/socket'
-- <value name="listen_address">127.0.0.1:9000</value>
-+ <value name="listen_address">/var/run/php/fpm.sock</value>
-
- <value name="listen_options">
-
-@@ -60,10 +60,10 @@
- </value>
-
- Unix user of processes
-- <!-- <value name="user">nobody</value> -->
-+ <value name="user">http</value>
-
- Unix group of processes
-- <!-- <value name="group">@php_fpm_group@</value> -->
-+ <value name="group">http</value>
-
- Process manager settings
- <value name="pm">
-@@ -129,7 +129,7 @@
- Useful to work around memory leaks in 3rd party libraries.
- For endless request processing please specify 0
- Equivalent to PHP_FCGI_MAX_REQUESTS
-- <value name="max_requests">500</value>
-+ <value name="max_requests">100000</value>
-
- Comma separated list of ipv4 addresses of FastCGI clients that allowed to connect.
- Equivalent to FCGI_WEB_SERVER_ADDRS environment in original php.fcgi (5.2.2+)
-@@ -139,14 +139,7 @@
- Pass environment variables like LD_LIBRARY_PATH
- All $VARIABLEs are taken from current environment
- <value name="environment">
-- <value name="HOSTNAME">$HOSTNAME</value>
-- <value name="PATH">/usr/local/bin:/usr/bin:/bin</value>
-- <value name="TMP">/tmp</value>
-- <value name="TMPDIR">/tmp</value>
-- <value name="TEMP">/tmp</value>
-- <value name="OSTYPE">$OSTYPE</value>
-- <value name="MACHTYPE">$MACHTYPE</value>
-- <value name="MALLOC_CHECK_">2</value>
-+ <value name="PATH">$PATH</value>
- </value>
-
- </section>
+--- php-5.3.14/sapi/fpm/php-fpm.conf.in~ 2012-06-13 11:18:44.000000000 +0300
++++ php-5.3.14/sapi/fpm/php-fpm.conf.in 2012-07-12 15:38:49.056368781 +0300
+@@ -22,7 +22,7 @@
+ ; Pid file
+ ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
+ ; Default Value: none
+-;pid = run/php-fpm.pid
++pid = /var/run/php/fpm.pid
+
+ ; Error log file
+ ; If it's set to "syslog", log is sent to syslogd instead of being written
+@@ -140,7 +140,7 @@
+ ; specific port;
+ ; '/path/to/unix/socket' - to listen on a unix socket.
+ ; Note: This value is mandatory.
+-listen = 127.0.0.1:9000
++listen = /var/run/php/fpm.sock
+
+ ; Set listen(2) backlog. A value of '-1' means unlimited.
+ ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
+@@ -161,7 +161,7 @@
+ ; must be separated by a comma. If this value is left blank, connections will be
+ ; accepted from any ip address.
+ ; Default Value: any
+-;listen.allowed_clients = 127.0.0.1
++listen.allowed_clients = 127.0.0.1
+
+ ; Choose how the process manager will control the number of child processes.
+ ; Possible Values:
+@@ -208,12 +208,12 @@
+ ; The desired minimum number of idle server processes.
+ ; Note: Used only when pm is set to 'dynamic'
+ ; Note: Mandatory when pm is set to 'dynamic'
+-pm.min_spare_servers = 1
++pm.min_spare_servers = 2
+
+ ; The desired maximum number of idle server processes.
+ ; Note: Used only when pm is set to 'dynamic'
+ ; Note: Mandatory when pm is set to 'dynamic'
+-pm.max_spare_servers = 3
++pm.max_spare_servers = 5
+
+ ; The number of seconds after which an idle process will be killed.
+ ; Note: Used only when pm is set to 'ondemand'
+@@ -323,7 +323,7 @@
+ ; anything, but it may not be a good idea to use the .php extension or it
+ ; may conflict with a real PHP file.
+ ; Default Value: not set
+-;pm.status_path = /status
++;pm.status_path = /fpm-status
+
+ ; The ping URI to call the monitoring page of FPM. If this value is not set, no
+ ; URI will be recognized as a ping page. This could be used to test from outside
+@@ -449,7 +449,7 @@
+ ; Note: on highloaded environement, this can cause some delay in the page
+ ; process time (several ms).
+ ; Default Value: no
+-;catch_workers_output = yes
++catch_workers_output = yes
+
+ ; Limits the extensions of the main script FPM will allow to parse. This can
+ ; prevent configuration mistakes on the web server side. You should only limit
+@@ -463,7 +463,7 @@
+ ; the current environment.
+ ; Default Value: clean env
+ ;env[HOSTNAME] = $HOSTNAME
+-;env[PATH] = /usr/local/bin:/usr/bin:/bin
++env[PATH] = $PATH
+ ;env[TMP] = /tmp
+ ;env[TMPDIR] = /tmp
+ ;env[TEMP] = /tmp
+--- php-5.3.9/sapi/fpm/status.html.in~ 2011-10-08 23:43:12.000000000 +0300
++++ php-5.3.9/sapi/fpm/status.html.in 2012-01-12 02:19:09.573191879 +0200
+@@ -96,7 +96,7 @@
+ var sort_index;
+ var sort_order;
+
+- doc_url.value = location.protocol + '//' + location.host + "/status?json&full";
++ doc_url.value = location.protocol + '//' + location.host + "/fpm-status?json&full";
+
+ ths = document.getElementsByTagName("th");
+ for (var i=0; i<ths.length; i++) {
+--- php-5.3.9/sapi/fpm/Makefile.frag~ 2012-01-11 21:49:42.000000000 +0200
++++ php-5.3.9/sapi/fpm/Makefile.frag 2012-01-12 02:20:25.553355153 +0200
+@@ -21,7 +21,7 @@
+ @echo "Installing PHP FPM config: $(INSTALL_ROOT)$(sysconfdir)/" && \
+ $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir) || :
+
+- @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default || :
++ @$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf || :
+
+ @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/"
+ @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8
projects / packages / php.git / blobdiff