fat Sat, 29 May 2010 10:39:35 +
Revision: http://svn.php.net/viewvc?view=revision&revision=299932
Log:
typo (thx to Brian P. Mercer)
Changed paths:
U php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in
U php/php-src/trunk/sapi/fpm/php-fpm.conf.in
Modified: php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in
===
--- php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in 2010-05-29 04:55:04 UTC (rev 299931)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in 2010-05-29 10:39:35 UTC (rev 299932)
@@ -1,285 +1,272 @@
-;
-; All relative paths in this config are relative to php's install prefix
-;
-;
-; Include one or more files.
-; If glob(3) exists, it's used to include a bunch of files from a glob(3) pattern
-; This directive can be used everywhere in the file.
-;
+;
+; FPM Configuration ;
+;
+
+; All relative paths in this configuration file are relative to PHP's install
+; prefix.
+
+; Include one or more files. If glob(3) exists, it is used to include a bunch of
+; files from a glob(3) pattern. This directive can be used everywhere in the
+; file.
;inclu...@expanded_sysconfdir@/fpm.d/*.conf
-;
-;
+;;
+; Global Options ;
+;;
+
[global]
; Pid file
-; default: none
-;
+; Default Value: none
;pid = @EXPANDED_LOCALSTATEDIR@/run/php-fpm.pid
; Error log file
-; default: @EXPANDED_LOCALSTATEDIR@/log/php-fpm.log
-;
+; Default Value: @EXPANDED_LOCALSTATEDIR@/log/php-fpm.log
;error_log = @EXPANDED_LOCALSTATEDIR@/log/php-fpm.log
; Log level
-; alert, error, warning, notice, debug
-; default: notice
-;
+; Possible Values: alert, error, warning, notice, debug
+; Default Value: notice
;log_level = notice
-; When this amount of php processes exited with SIGSEGV or SIGBUS,
-; php-fpm will restart
-; 0 means 'Off'
-; default: 0
-;
+; If this number of child processes exit with SIGSEGV or SIGBUS within the time
+; interval set by emergency_restart_interval then FPM will restart. A value
+; of '0' means 'Off'.
+; Default Value: 0
;emergency_restart_threshold = 0
-; ... in a less than this interval of time, a graceful restart will be initiated.
-; Useful to work around accidental curruptions in accelerator's shared memory.
-; available units are s(econd)(default), m(inute), h(hour), or d(day)
-; default : 0
-;
+; Interval of time used by emergency_restart_interval to determine when
+; a graceful restart will be initiated. This can be useful to work around
+; accidental corruptions in an accelerator's shared memory.
+; Available Units: s(econds), m(inutes), h(ours), or d(ays)
+; Default Unit: seconds
+; Default Value: 0
;emergency_restart_interval = 0
-; Time limit on waiting child's reaction on signals from master
-; available units are s(econd)(default), m(inute), h(hour), or d(day)
-; default : 0
-;
+; Time limit for child processes to wait for a reaction on signals from master.
+; Available units: s(econds), m(inutes), h(ours), or d(ays)
+; Default Unit: seconds
+; Default Value: 0
;process_control_timeout = 0
-; send fpm to backgound
-; set to 'no' to keep FPM in foreground for debugging
-; default : yes
-;
+; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging.
+; Default Value: yes
;daemonize = yes
-; Start a new pool named 'www'
-; The name is used in logs and stats
-; There is no limitation on the number of pool FPM can handle. Your system will tell you anyway :)
+
+; Pool Definitions ;
+
+
+; Multiple pools of child processes may be started with different listening
+; ports and different management options. The name of the pool will be
+; used in logs and stats. There is no limitation on the number of pools which
+; FPM can handle. Your system will tell you anyway :)
+
+; Start a new pool named 'www'.
[www]
-; Address to accept fastcgi requests on.
+; The address on which to accept FastCGI requests.
; Valid syntaxes are:
-; - 'ip.add.re.ss:port' to listen on a TCP scoket to the specific address on the specific port
-; - 'port' to listen on a TCP socket to all addreses on the specific port
-; - '/path/to/unix/socket' to listen on a unix socket
-; it's mandatory
-;
+; 'ip.add.re.ss:port'- to listen on a TCP socket to a specific address on
+;a specific port;
+; 'port' - to listen on a TCP socket to all addresses on a
+;specific port;
+; '/path/to/unix/socket' - to listen on a unix socket.
+; Note: This value is mandatory.
listen = 127.0.0.1:9000
-; Set listen(2) backlog
-; -1 means unlimited
-; default : -1
-;
+; Set listen(2) backlog. A value of '-1' means unlimited.
+; Default Value: -1
;listen.backlog = -1
; List of ipv4 addresses of FastCGI clients which are allowed to connect.
-; Equivalent to FCGI_WEB_SERVER_ADDRS environment in original php.fcg
