fat                                      Mon, 23 Aug 2010 23:22:36 +0000

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

Log:
- Changed listen.backlog in the FPM configuration file to default to 128
  instead of -1. This is the same value as the one used in the cgi sapi.

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

Modified: php/php-src/trunk/NEWS
===================================================================
--- php/php-src/trunk/NEWS      2010-08-23 23:03:59 UTC (rev 302724)
+++ php/php-src/trunk/NEWS      2010-08-23 23:22:36 UTC (rev 302725)
@@ -65,6 +65,8 @@
   opcode operands into a separate literal table. (Dmitry)
 - Changed session.entropy_file to default to /dev/urandom or /dev/arandom if
   either is present at compile time. (Rasmus)
+- Changed listen.backlog in the FPM configuration file to default to 128
+  instead of -1 (fat)

 - Improved CLI Interactive readline shell (Johannes)
   . Added cli.pager ini setting to set a pager for output.

Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c
===================================================================
--- php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c   2010-08-23 23:03:59 UTC (rev 
302724)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_conf.c   2010-08-23 23:22:36 UTC (rev 
302725)
@@ -322,7 +322,7 @@
        }

        memset(wp->config, 0, sizeof(struct fpm_worker_pool_config_s));
-       wp->config->listen_backlog = -1;
+       wp->config->listen_backlog = 128;

        if (!fpm_worker_all_pools) {
                fpm_worker_all_pools = wp;

Modified: php/php-src/trunk/sapi/fpm/php-fpm.conf.in
===================================================================
--- php/php-src/trunk/sapi/fpm/php-fpm.conf.in  2010-08-23 23:03:59 UTC (rev 
302724)
+++ php/php-src/trunk/sapi/fpm/php-fpm.conf.in  2010-08-23 23:22:36 UTC (rev 
302725)
@@ -74,9 +74,9 @@
 ; Note: This value is mandatory.
 listen = 127.0.0.1:9000

-; Set listen(2) backlog. A value of '-1' means unlimited.
-; Default Value: -1
-;listen.backlog = -1
+; Set listen(2) backlog.
+; Default Value: 128
+;listen.backlog = 128

 ; List of ipv4 addresses of FastCGI clients which are allowed to connect.
 ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original

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

Reply via email to