- Changed listen.backlog in the FPM configuration file to default to 128

  instead of -1 (except on FreeBSD and OpenBSD). This is the same value
  as the one used in the cgi sapi. This patch completes revision 302725.

diff --git a/NEWS b/NEWS
index a45ff9a793d068a6e50c256ae045a912800d6d21..c98e91743514e4fca9271b2d1c0734e41021c253 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,7 @@
   (Kalle)
 - Changed the $context parameter on copy() to actually have an effect. (Kalle)
 - Fixed possible crash in mssql_fetch_batch(). (Kalle)
+- Fixed inconsistent backlog default value (-1) in FPM on many systems. (fat)
 
 - Fixed bug #52745 (Binding params doesn't work when selecting a date inside a
   CASE-WHEN). (Andrey)

diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c
index 958f68b991c6fbf46a7761e4b24de6cff373768b..4c7e6d618cf04290bc18ff76e09d3bb7a208d57f 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 = FPM_BACKLOG_DEFAULT;
 
        if (!fpm_worker_all_pools) {
                fpm_worker_all_pools = wp;

diff --git a/sapi/fpm/fpm/fpm_sockets.h b/sapi/fpm/fpm/fpm_sockets.h
index d9e283d5a3271a2bdca2be5b3d05ae7bebc0ab17..8bd778ea5078f871b8c89491582874a0e14bedf9 100644 (file)
--- a/sapi/fpm/fpm/fpm_sockets.h
+++ b/sapi/fpm/fpm/fpm_sockets.h
@@ -10,6 +10,15 @@
 
 #include "fpm_worker_pool.h"
 
+/*
+  On FreeBSD and OpenBSD, backlog negative values are truncated to SOMAXCONN
+*/
+#if (__FreeBSD__) || (__OpenBSD__)
+#define FPM_BACKLOG_DEFAULT -1
+#else
+#define FPM_BACKLOG_DEFAULT 128
+#endif
+
 enum fpm_address_domain fpm_sockets_domain_from_address(char *addr);
 int fpm_sockets_init_main();
 

diff --git a/sapi/fpm/php-fpm.conf.in b/sapi/fpm/php-fpm.conf.in
index 6a73047adcb532dda9feb42418b3647f7a429595..ca45fb414c7e7a8d2d9b4530016cd1bf59236714 100644 (file)
--- a/sapi/fpm/php-fpm.conf.in
+++ b/sapi/fpm/php-fpm.conf.in
@@ -75,7 +75,7 @@
 listen = 127.0.0.1:9000
 
 ; Set listen(2) backlog. A value of '-1' means unlimited.
-; Default Value: -1
+; Default Value: 128 (-1 on FreeBSD and OpenBSD)
 ;listen.backlog = -1
  
 ; List of ipv4 addresses of FastCGI clients which are allowed to connect.