summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Olexa <darkside@gentoo.org>2012-07-23 17:23:20 +0000
committerJeremy Olexa <darkside@gentoo.org>2012-07-23 17:23:20 +0000
commit67692cfd41d719a08be8d897f02a19e765a70519 (patch)
treec321e99d84b35ab3b05c0cc5b87fff2df56e5667 /profiles
parentclosing Bug 426766, making plugins respect cxxflags (diff)
downloadgentoo-2-67692cfd41d719a08be8d897f02a19e765a70519.tar.gz
gentoo-2-67692cfd41d719a08be8d897f02a19e765a70519.tar.bz2
gentoo-2-67692cfd41d719a08be8d897f02a19e765a70519.zip
add limit_conn desc
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/desc/nginx_modules_http.desc5
2 files changed, 7 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index d123a37f2dc6..b81ed504921d 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6831 2012/07/23 11:33:28 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6832 2012/07/23 17:23:20 darkside Exp $
#
# This ChangeLog should include records for all changes in profiles directory.
# Only typo fixes which don't affect portage/repoman behaviour could be avoided
# here. If in doubt put a record here!
+ 23 Jul 2012; Jeremy Olexa <darkside@gentoo.org> desc/nginx_modules_http.desc:
+ add limit_conn desc
+
23 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
default/linux/package.use.mask:
p.use.mask system-libs for spideroak-bin, bug #426798
diff --git a/profiles/desc/nginx_modules_http.desc b/profiles/desc/nginx_modules_http.desc
index 06cad20a0489..0b8f81864df0 100644
--- a/profiles/desc/nginx_modules_http.desc
+++ b/profiles/desc/nginx_modules_http.desc
@@ -1,6 +1,6 @@
-# Copyright 2010-2012 Gentoo Foundation.
+# Copyright 1999-2012 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/desc/nginx_modules_http.desc,v 1.9 2012/04/13 15:14:11 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/desc/nginx_modules_http.desc,v 1.10 2012/07/23 17:23:20 darkside Exp $
# This file contains descriptions of NGINX_MODULES_HTTP USE_EXPAND flags.
@@ -24,6 +24,7 @@ gzip - This module allows for on-the-fly gzip compression.
gzip_static - Before serving a file from disk to a gzip-enabled client, this module will look for a precompressed file in the same location.
headers_more - Set and clear input and output headers
image_filter - This module is a filter for transforming JPEG, GIF and PNG images.
+limit_conn - This module makes it possible to limit the number of simultaneous connections for the assigned session
limit_req - This module allows you to limit the number of requests for a given session.
limit_zone - This module makes it possible to limit the number of simultaneous connections for the assigned session
map - This module allows you to classify, or map a set of values into a different set of values and store the result in a variable.