- 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.

diff --git a/NEWS b/NEWS
index d4c448531bc53c226487c7f0a0cc2b590ba29d85..bc4b6f4d0c54f8848bfdc6e39f99ef74761044ad 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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.

diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c
index 958f68b991c6fbf46a7761e4b24de6cff373768b..2a20d9d9f9cda537042e3b4f42b019eaa1aaa2f0 100644 (file)
--- a/sapi/fpm/fpm/fpm_conf.c
+++ b/sapi/fpm/fpm/fpm_conf.c
@@ -322,7 +322,7 @@ static void *fpm_worker_pool_config_alloc() /* {{{ */
        }
 
        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;

diff --git a/sapi/fpm/php-fpm.conf.in b/sapi/fpm/php-fpm.conf.in
index 6a73047adcb532dda9feb42418b3647f7a429595..6d02f0996bb5c7dd0965678aad7688849c678894 100644 (file)
--- a/sapi/fpm/php-fpm.conf.in
+++ b/sapi/fpm/php-fpm.conf.in
@@ -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