summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'www-servers/nginx')
-rw-r--r--www-servers/nginx/ChangeLog5
-rw-r--r--www-servers/nginx/files/nginx.conf-r42
2 files changed, 5 insertions, 2 deletions
diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index 9397801cb88d..8ac972dc544f 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for www-servers/nginx
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.267 2010/08/10 07:45:19 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.268 2010/09/19 08:37:53 hollow Exp $
+
+ 19 Sep 2010; Benedikt Böhm <hollow@gentoo.org> files/nginx.conf-r4:
+ default to 1024 worker connections (see #337639)
*nginx-0.8.49 (10 Aug 2010)
diff --git a/www-servers/nginx/files/nginx.conf-r4 b/www-servers/nginx/files/nginx.conf-r4
index f8c10f27b50a..74c015f708ca 100644
--- a/www-servers/nginx/files/nginx.conf-r4
+++ b/www-servers/nginx/files/nginx.conf-r4
@@ -4,7 +4,7 @@ worker_processes 1;
error_log /var/log/nginx/error_log info;
events {
- worker_connections 8192;
+ worker_connections 1024;
use epoll;
}