From: Jérôme Loyet <fat@php.net>
Date: Fri, 23 Apr 2010 08:06:49 +0000 (+0000)
Subject: typo and errors in php-fpm.conf
X-Git-Tag: php-5.4.0alpha1~191^2~1676
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b2a1964312c288c5311421c01f18b4087614534;p=php

typo and errors in php-fpm.conf
---

diff --git a/sapi/fpm/php-fpm.conf.in b/sapi/fpm/php-fpm.conf.in
index 4d5d874752..f999a00a25 100644
--- a/sapi/fpm/php-fpm.conf.in
+++ b/sapi/fpm/php-fpm.conf.in
@@ -71,6 +71,14 @@ listen = 127.0.0.1:9000
 ; 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 @@ pm.max_children = 50
 ; 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 @@ pm.max_children = 50
 ;
 ; 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 @@ pm.max_children = 50
 ;
 ;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