changeset 931:e20e94d75fe3

Merge (someone needs to remember to pull...)
author Marco Cirillo <maranda@lightwitch.org>
date Tue, 12 Mar 2013 19:09:26 +0100
parents c08b424583c3 (diff) 4584c3303bb4 (current diff)
children 4e235e565693
files
diffstat 2 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mod_c2s_conn_throttle/mod_c2s_conn_throttle.lua	Tue Mar 12 13:49:36 2013 +0100
+++ b/mod_c2s_conn_throttle/mod_c2s_conn_throttle.lua	Tue Mar 12 19:09:26 2013 +0100
@@ -1,9 +1,5 @@
 -- Clients Connection Throttler.
--- Usage:
--- Add the module into modules loaded into the virtual host section
---
--- cthrottler_logins_count = 3 -> number of logins attempt allowed
--- cthrottler_time = 120 -> in x seconds
+-- (C) 2012-2013, Marco Cirillo (LW.Org)
 
 local time = os.time
 local in_count = {}
--- a/mod_s2s_never_encrypt_blacklist/mod_s2s_never_encrypt_blacklist.lua	Tue Mar 12 13:49:36 2013 +0100
+++ b/mod_s2s_never_encrypt_blacklist/mod_s2s_never_encrypt_blacklist.lua	Tue Mar 12 19:09:26 2013 +0100
@@ -1,4 +1,5 @@
 -- Filter out servers which gets choppy and buggy when it comes to starttls.
+-- (C) 2011-2013, Marco Cirillo (LW.Org)
 
 local bad_servers = module:get_option_set("tls_s2s_blacklist", {})
 local bad_servers_ip = module:get_option_set("tls_s2s_blacklist_ip", {})