- 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.
This commit is contained in:
Jérôme Loyet 2010-08-31 09:33:53 +00:00
parent 1fc65cbf03
commit bf28d740e3
4 changed files with 11 additions and 4 deletions

2
NEWS
View File

@ -67,8 +67,6 @@
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.

View File

@ -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 = 128;
wp->config->listen_backlog = FPM_BACKLOG_DEFAULT;
if (!fpm_worker_all_pools) {
fpm_worker_all_pools = wp;

View File

@ -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();

View File

@ -75,7 +75,7 @@
listen = 127.0.0.1:9000
; Set listen(2) backlog.
; Default Value: 128
; Default Value: 128 (-1 on FreeBSD and OpenBSD)
;listen.backlog = 128
; List of ipv4 addresses of FastCGI clients which are allowed to connect.