summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2010-09-19 08:37:53 +0000
committerBenedikt Boehm <hollow@gentoo.org>2010-09-19 08:37:53 +0000
commitf8c7fc76d4e6cbf71e09110524bd20b52dd3c23c (patch)
tree885626da39284d54fed960cebbcd996ff5357ed3 /www-servers
parentversion bump wrt #337597; remove old ebuild (diff)
downloadhistorical-f8c7fc76d4e6cbf71e09110524bd20b52dd3c23c.tar.gz
historical-f8c7fc76d4e6cbf71e09110524bd20b52dd3c23c.tar.bz2
historical-f8c7fc76d4e6cbf71e09110524bd20b52dd3c23c.zip
default to 1024 worker connections (see #337639)
Package-Manager: portage-2.2_rc83/cvs/Linux x86_64
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/nginx/ChangeLog5
-rw-r--r--www-servers/nginx/Manifest4
-rw-r--r--www-servers/nginx/files/nginx.conf-r42
3 files changed, 7 insertions, 4 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/Manifest b/www-servers/nginx/Manifest
index e9a4507594c5..30d30f5bd2dc 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,4 +1,4 @@
-AUX nginx.conf-r4 1359 RMD160 472f54bcca4a351ed7300bd7f31ceb8c64d6a866 SHA1 b87f5fc0daa61ffd27f112f29ccd1eb409681383 SHA256 50ddb332bd3374ac5879c58ed531c395e269523a3b8e1c950fe9bda4ce087c9c
+AUX nginx.conf-r4 1358 RMD160 a948df249a16be86c114d587cfa5ee570d84a356 SHA1 e9db0447a1beb326a0858cf8189328229d1d3edf SHA256 6ff6c9301ea2a4d74a335b9119d7f9dba87d4e83793cf22d837d49f061763096
AUX nginx.init-r2 1657 RMD160 a42538ae12cccfad1108fe2fca387ec666f4fd85 SHA1 7a0706894bed322d8b5814de98bca56d48c458d0 SHA256 9fceee69794de55b6da24ff2d11c72f6bc86339e7088c644b165dc35a9d5afa1
AUX nginx.logrotate 332 RMD160 65314d1b78142f3653e98e0c2cdff9deec69fd77 SHA1 c6b218d9c4588eb8fd51fe32b9692c39d6138c2b SHA256 eec16aa176ade9d6c428ce5979f6bace1dd2ad5ba609ae22279a57f154e08497
AUX passenger-CFLAGS.patch 646 RMD160 12f1e5f80fd2694fed612226561670f9a0f7f556 SHA1 1f9e2df74069a8d863e850a0e7e13bd0e8fc8fcb SHA256 42b5221b418df055cd51d03057d92fb93c4f1bbca56a1ea35cc6f5c5d9e1953d
@@ -18,5 +18,5 @@ EBUILD nginx-0.8.46.ebuild 9403 RMD160 950b854385e85fe96556d202da4b4dc149690acc
EBUILD nginx-0.8.47.ebuild 9403 RMD160 a5f9650bb1e211822002bfa66aa850ad86970600 SHA1 f88f3215c325a3b2c8145d61239f4d59ea792f94 SHA256 6dbd5a392fd01d5b602d6ab5b293eb404f248b4d70f8fc69faeb2dd0c7cc8e38
EBUILD nginx-0.8.48.ebuild 10000 RMD160 187583ef79d37c86a32a0aadd8cb428e538f20ad SHA1 7c13fcfafcbdedc715aac71545be17459fd6543a SHA256 169a7d79b0636884aa22a87b5cf210a44440ae1ec11e0e884d2e727005733f6c
EBUILD nginx-0.8.49.ebuild 10292 RMD160 1454d99751a66876b0ed72b64cffd205c5e19f4f SHA1 4b55618084d11efeebbf1db3a1e39b7af77d6fe0 SHA256 06750f529e5db8f9562e4641bd8ece0ebba819095fcbf9a46490b5f13a11c747
-MISC ChangeLog 43587 RMD160 9342ebb51e0f31c4bf89aa4fcb431f9eb8eb51d8 SHA1 e297d29e9030401ca8e712928529f683c2e9c245 SHA256 d86bd55dfb2973094495b2054f1dad23f1842f21a9d04e315b9fced966dc9e6d
+MISC ChangeLog 43708 RMD160 decf93b57c6f71fa12812f2081481f9b377a8b33 SHA1 69d4290adcc5ac506ad7560c172bba757397a395 SHA256 e23988f05557d4cd6a4a03d19556eee85bcde44550ccfde70a8a729e541cc9cc
MISC metadata.xml 1357 RMD160 d83e1c10ab29f088e5fe9bfe1cec707247f8abde SHA1 c07f6abb803f7a568e74cbcc8423b570730c9314 SHA256 31ed49b4b5c7f93eb0d4be1cd254542fbcf517b243ac4f8393c0aa8ccf05cdcf
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;
}