fat                                      Fri, 23 Apr 2010 08:06:49 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=298368

Log:
typo and errors in php-fpm.conf

Changed paths:
    U   php/php-src/trunk/sapi/fpm/php-fpm.conf.in

Modified: php/php-src/trunk/sapi/fpm/php-fpm.conf.in
===================================================================
--- php/php-src/trunk/sapi/fpm/php-fpm.conf.in  2010-04-23 06:56:15 UTC (rev 
298367)
+++ php/php-src/trunk/sapi/fpm/php-fpm.conf.in  2010-04-23 08:06:49 UTC (rev 
298368)
@@ -71,6 +71,14 @@
 ; default : -1
 ;
 ;listen.backlog = -1
+
+; 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+)
+; Makes sense only with a tcp listening socket.
+; Each addresses must be separated by a comma
+; default: any
+;
+;listen.allowed_client = 127.0.0.1

 ; Set permissions for unix socket, if one used.
 ; In Linux read/write permissions must be set in order to allow connections 
from web server.
@@ -134,7 +142,7 @@
 ; Equivalent to PHP_FCGI_MAX_REQUESTS
 ; default : 0
 ;
-;max_requests = 500
+;pm.max_requests = 500

 ; Sets the status URI to call to obtain php-fpm status page.
 ; If not set, no URI will be recognized as a status page.
@@ -191,7 +199,7 @@
 ;
 ; default: pong
 ;
-;pong.response = pong
+;ping.response = pong

 ; The timeout (in seconds) for serving a single request after which the worker 
process will be terminated
 ; Should be used when 'max_execution_time' ini option does not stop script 
execution for some reason
@@ -245,14 +253,6 @@
 ;
 ;catch_workers_output = yes

-; 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+)
-; Makes sense only with a tcp listening socket.
-; Each addresses must be separated by a comma
-; default: any
-;
-;listen.allowed_client = 127.0.0.1
-
 ; Pass environment variables like LD_LIBRARY_PATH
 ; All $VARIABLEs are taken from current environment
 ; default: clean env

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to