[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/sapi/fpm/ php-fpm.conf.in

2012-02-20 Thread Rasmus Lerdorf 
rasmus   Mon, 20 Feb 2012 20:29:26 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=323395

Log:
Fix bug 61149

Bug: https://bugs.php.net/61149 (Open) access.format directive should be in 
quotation marks
  
Changed paths:
U   php/php-src/branches/PHP_5_3/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   2012-02-20 
18:28:57 UTC (rev 323394)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in   2012-02-20 
20:29:26 UTC (rev 323395)
@@ -399,7 +399,7 @@
 ;  %u: remote user
 ;
 ; Default: %R - %u %t \%m %r\ %s
-;access.format = %R - %u %t %m %r%Q%q %s %f %{mili}d %{kilo}M %C%%
+;access.format = %R - %u %t %m %r%Q%q %s %f %{mili}d %{kilo}M %C%%

 ; The log file for slow requests
 ; Default Value: not set

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

Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/sapi/fpm/ php-fpm.conf.in

2012-02-20 Thread Hannes Magnusson 
On Mon, Feb 20, 2012 at 21:29, Rasmus Lerdorf ras...@php.net wrote:
 rasmus                                   Mon, 20 Feb 2012 20:29:26 +

 Revision: http://svn.php.net/viewvc?view=revisionrevision=323395

 Log:
 Fix bug 61149

 Bug: https://bugs.php.net/61149 (Open) access.format directive should be in 
 quotation marks

 Changed paths:
    U   php/php-src/branches/PHP_5_3/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       2012-02-20 
 18:28:57 UTC (rev 323394)
 +++ php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in       2012-02-20 
 20:29:26 UTC (rev 323395)
 @@ -399,7 +399,7 @@
  ;  %u: remote user
  ;
  ; Default: %R - %u %t \%m %r\ %s
 -;access.format = %R - %u %t %m %r%Q%q %s %f %{mili}d %{kilo}M %C%%
 +;access.format = %R - %u %t %m %r%Q%q %s %f %{mili}d %{kilo}M %C%%

That doesn't look right. Don't the inner  need to be escaped?

-Hannes

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

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/sapi/fpm/ php-fpm.conf.in

2012-02-20 Thread Rasmus Lerdorf 
rasmus   Tue, 21 Feb 2012 00:01:19 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=323396

Log:
Yup, these need to be escaped. Good catch.

Changed paths:
U   php/php-src/branches/PHP_5_3/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   2012-02-20 
20:29:26 UTC (rev 323395)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in   2012-02-21 
00:01:19 UTC (rev 323396)
@@ -399,7 +399,7 @@
 ;  %u: remote user
 ;
 ; Default: %R - %u %t \%m %r\ %s
-;access.format = %R - %u %t %m %r%Q%q %s %f %{mili}d %{kilo}M %C%%
+;access.format = %R - %u %t \%m %r%Q%q\ %s %f %{mili}d %{kilo}M %C%%

 ; The log file for slow requests
 ; Default Value: not set

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/sapi/fpm/php-fpm.conf.in branches/PHP_5_4/sapi/fpm/php-fpm.conf.in trunk/sapi/fpm/php-fpm.conf.in

2011-07-04 Thread Jérôme Loyet 
fat  Mon, 04 Jul 2011 12:49:46 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=312903

Log:
fix comment syntax

Changed paths:
U   php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in
U   php/php-src/branches/PHP_5_4/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   2011-07-04 
11:21:41 UTC (rev 312902)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in   2011-07-04 
12:49:46 UTC (rev 312903)
@@ -322,7 +322,7 @@
 ;  - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e
 ;  - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e
 ;  %f: script filename
-:  %l: content-length of the request (for POST request only)
+;  %l: content-length of the request (for POST request only)
 ;  %m: request method
 ;  %M: peak of memory allocated by PHP
 ;  it can accept the following format:

Modified: php/php-src/branches/PHP_5_4/sapi/fpm/php-fpm.conf.in
===
--- php/php-src/branches/PHP_5_4/sapi/fpm/php-fpm.conf.in   2011-07-04 
11:21:41 UTC (rev 312902)
+++ php/php-src/branches/PHP_5_4/sapi/fpm/php-fpm.conf.in   2011-07-04 
12:49:46 UTC (rev 312903)
@@ -322,7 +322,7 @@
 ;  - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e
 ;  - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e
 ;  %f: script filename
-:  %l: content-length of the request (for POST request only)
+;  %l: content-length of the request (for POST request only)
 ;  %m: request method
 ;  %M: peak of memory allocated by PHP
 ;  it can accept the following format:

Modified: php/php-src/trunk/sapi/fpm/php-fpm.conf.in
===
--- php/php-src/trunk/sapi/fpm/php-fpm.conf.in  2011-07-04 11:21:41 UTC (rev 
312902)
+++ php/php-src/trunk/sapi/fpm/php-fpm.conf.in  2011-07-04 12:49:46 UTC (rev 
312903)
@@ -322,7 +322,7 @@
 ;  - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e
 ;  - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e
 ;  %f: script filename
-:  %l: content-length of the request (for POST request only)
+;  %l: content-length of the request (for POST request only)
 ;  %m: request method
 ;  %M: peak of memory allocated by PHP
 ;  it can accept the following format:

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/sapi/fpm/php-fpm.conf.in branches/PHP_5_4/sapi/fpm/php-fpm.conf.in trunk/sapi/fpm/php-fpm.conf.in

2011-06-17 Thread Jérôme Loyet 
fat  Fri, 17 Jun 2011 23:35:47 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=312245

Log:
missing doc in the conf file

Changed paths:
U   php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in
U   php/php-src/branches/PHP_5_4/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   2011-06-17 
23:19:54 UTC (rev 312244)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in   2011-06-17 
23:35:47 UTC (rev 312245)
@@ -195,11 +195,12 @@
 ;   total processes:  100
 ;   max children reached: 1
 ; By default the status page output is formatted as text/plain. Passing either
-; 'html' or 'json' as a query string will return the corresponding output
+; 'html', 'xml' or 'json' as a query string will return the corresponding 
output
 ; syntax. Example:
 ;   http://www.foo.bar/status
 ;   http://www.foo.bar/status?json
 ;   http://www.foo.bar/status?html
+;   http://www.foo.bar/status?xml
 ; Note: The value must start with a leading slash (/). The value can be
 ;   anything, but it may not be a good idea to use the .php extension or it
 ;   may conflict with a real PHP file.

Modified: php/php-src/branches/PHP_5_4/sapi/fpm/php-fpm.conf.in
===
--- php/php-src/branches/PHP_5_4/sapi/fpm/php-fpm.conf.in   2011-06-17 
23:19:54 UTC (rev 312244)
+++ php/php-src/branches/PHP_5_4/sapi/fpm/php-fpm.conf.in   2011-06-17 
23:35:47 UTC (rev 312245)
@@ -195,11 +195,12 @@
 ;   total processes:  100
 ;   max children reached: 1
 ; By default the status page output is formatted as text/plain. Passing either
-; 'html' or 'json' as a query string will return the corresponding output
+; 'html', 'xml' or 'json' as a query string will return the corresponding 
output
 ; syntax. Example:
 ;   http://www.foo.bar/status
 ;   http://www.foo.bar/status?json
 ;   http://www.foo.bar/status?html
+;   http://www.foo.bar/status?xml
 ; Note: The value must start with a leading slash (/). The value can be
 ;   anything, but it may not be a good idea to use the .php extension or it
 ;   may conflict with a real PHP file.

Modified: php/php-src/trunk/sapi/fpm/php-fpm.conf.in
===
--- php/php-src/trunk/sapi/fpm/php-fpm.conf.in  2011-06-17 23:19:54 UTC (rev 
312244)
+++ php/php-src/trunk/sapi/fpm/php-fpm.conf.in  2011-06-17 23:35:47 UTC (rev 
312245)
@@ -195,11 +195,12 @@
 ;   total processes:  100
 ;   max children reached: 1
 ; By default the status page output is formatted as text/plain. Passing either
-; 'html' or 'json' as a query string will return the corresponding output
+; 'html', 'xml' or 'json' as a query string will return the corresponding 
output
 ; syntax. Example:
 ;   http://www.foo.bar/status
 ;   http://www.foo.bar/status?json
 ;   http://www.foo.bar/status?html
+;   http://www.foo.bar/status?xml
 ; Note: The value must start with a leading slash (/). The value can be
 ;   anything, but it may not be a good idea to use the .php extension or it
 ;   may conflict with a real PHP file.

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/sapi/fpm/php-fpm.conf.in trunk/sapi/fpm/php-fpm.conf.in

2010-08-02 Thread Jérôme Loyet 
fat  Mon, 02 Aug 2010 09:02:48 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=301782

Log:
correct php-fpm.conf: slowlog has no default value

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-08-02 
07:53:38 UTC (rev 301781)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in   2010-08-02 
09:02:48 UTC (rev 301782)
@@ -212,7 +212,8 @@
 ;request_slowlog_timeout = 0

 ; The log file for slow requests
-; Default Value: @EXPANDED_LOCALSTATEDIR@/log/php-fpm.log.slow
+; Default Value: not set
+; Note: slowlog is mandatory if request_slowlog_timeout is set
 ;slowlog = @EXPANDED_LOCALSTATEDIR@/log/php-fpm.log.slow

 ; Set open file descriptor rlimit.

Modified: php/php-src/trunk/sapi/fpm/php-fpm.conf.in
===
--- php/php-src/trunk/sapi/fpm/php-fpm.conf.in  2010-08-02 07:53:38 UTC (rev 
301781)
+++ php/php-src/trunk/sapi/fpm/php-fpm.conf.in  2010-08-02 09:02:48 UTC (rev 
301782)
@@ -212,7 +212,8 @@
 ;request_slowlog_timeout = 0

 ; The log file for slow requests
-; Default Value: @EXPANDED_LOCALSTATEDIR@/log/php-fpm.log.slow
+; Default Value: not set
+; Note: slowlog is mandatory if request_slowlog_timeout is set
 ;slowlog = @EXPANDED_LOCALSTATEDIR@/log/php-fpm.log.slow

 ; Set open file descriptor rlimit.

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/sapi/fpm/php-fpm.conf.in trunk/sapi/fpm/php-fpm.conf.in

2010-05-29 Thread Jérôme Loyet 
fat  Sat, 29 May 2010 10:39:35 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=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-CVS] svn: /php/php-src/branches/PHP_5_3/sapi/fpm/ php-fpm.conf.in

2010-05-27 Thread Jérôme Loyet 
fat  Thu, 27 May 2010 22:18:58 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=299880

Log:
typo

Changed paths:
U   php/php-src/branches/PHP_5_3/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-27 
21:33:26 UTC (rev 299879)
+++ php/php-src/branches/PHP_5_3/sapi/fpm/php-fpm.conf.in   2010-05-27 
22:18:58 UTC (rev 299880)
@@ -27,7 +27,8 @@
 ;
 ;log_level = notice

-; When this amount of php processes exited with SIGSEGV or SIGBUS ...
+; When this amount of php processes exited with SIGSEGV or SIGBUS,
+; php-fpm will restart
 ; 0 means 'Off'
 ; default: 0
 ;
@@ -35,18 +36,18 @@

 ; ... 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), m(inute), h(hour), or d(day)
-; default : 0s
+; available units are s(econd)(default), m(inute), h(hour), or d(day)
+; default : 0
 ;
-;emergency_restart_interval = 0s
+;emergency_restart_interval = 0

 ; Time limit on waiting child's reaction on signals from master
-; available units are s(econd), m(inute), h(hour), or d(day)
-; default : 0s
+; available units are s(econd)(default), m(inute), h(hour), or d(day)
+; default : 0
 ;
-;process_control_timeout = 0s
+;process_control_timeout = 0

-; send fpm to backgound (default)
+; send fpm to backgound
 ; set to 'no' to keep FPM in foreground for debugging
 ; default : yes
 ;
@@ -54,12 +55,12 @@

 ; Start a new pool named 'www'
 ; The name is used in logs and stats
-; There is no limitation of the number of pool FPM can handle. Your system 
will tell you anyway :)
+; There is no limitation on the number of pool FPM can handle. Your system 
will tell you anyway :)
 [www]

 ; Address to accept fastcgi requests on.
 ; Valid syntaxes are:
-; - 'ip.ad.re.ss:port' to listen on a TCP scoket to the specific address on 
the specific port
+; - '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
@@ -72,10 +73,11 @@
 ;
 ;listen.backlog = -1

-; List of ipv4 addresses of FastCGI clients that allowed to connect.
+; List of ipv4 addresses of FastCGI clients which are 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
+; If it's left blank, it accept connection from any ip address
 ; default: any
 ;
 ;listen.allowed_clients = 127.0.0.1
@@ -101,10 +103,10 @@
 ; - dynamic : The number of child processes are set up dynamically depending 
on the following directives
 ; - pm.max_children  : the maximum number of children that can 
be alive at the same time
 ; - pm.start_servers : the number of children created on 
startup
-; - pm.min_spare_servers : the minimum number of children in 
'idle' state (waiting to precess).
+; - pm.min_spare_servers : the minimum number of children in 
'idle' state (waiting to process).
 ;  If the number of 'idle' processes is 
less than this number,
 ;  some children will be created.
-; - pm.max_spare_servers : the maximum number of children in 
'idle' state (waiting to precess).
+; - pm.max_spare_servers : the maximum number of children in 
'idle' state (waiting to process).
 ;  If the number of 'idle' processes is 
greater than this number,
 ;  some children will be killed;
 ; It's mandatory
@@ -201,27 +203,27 @@
 ;
 ;ping.response = pong

-; The timeout (in seconds) for serving a single request after which the worker 
process will be terminated
+; The timeout for serving a single request after which the worker process will 
be killed
 ; Should be used when 'max_execution_time' ini option does not stop script 
execution for some reason
 ; '0' means 'off'
-; available units are s(econd), m(inute), h(hour), or d(day)
+; available units are s(econd)(default), m(inute), h(hour), or d(day)
 ; default: 0
 ;
-;request_terminate_timeout = 0s
+;request_terminate_timeout = 0

-; The timeout (in seconds) for serving of single request after which a php 
backtrace will be dumped to slow.log file
+; The timeout for serving of single request after which a php backtrace will 
be dumped to slow.log file
 ; '0s' means 'off'
-; available units are s(econd), m(inute), h(hour), or d(day)
+; available units are s(econd)(default), m(inute), h(hour), or d(day)
 ; default: 0
 ;
-;request_slowlog_timeout = 0s