# HG changeset patch # User Marco Cirillo # Date 1363111766 -3600 # Node ID e20e94d75fe3a2e5610d9f26a801cb561c3bbdb0 # Parent c08b424583c36e21a24c1eca31c8e6c496676a83# Parent 4584c3303bb42bd88725ea03df4e8c17e587f923 Merge (someone needs to remember to pull...) diff -r 4584c3303bb4 -r e20e94d75fe3 mod_c2s_conn_throttle/mod_c2s_conn_throttle.lua --- 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 = {} diff -r 4584c3303bb4 -r e20e94d75fe3 mod_s2s_never_encrypt_blacklist/mod_s2s_never_encrypt_blacklist.lua --- 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", {})