aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2015-02-13 11:53:23 +0000
committerVsevolod Stakhov <vsevolod@highsecure.ru>2015-02-13 11:53:23 +0000
commit07ecd3fd88213a7ebe51715ad608b1e5585467e3 (patch)
tree01125f079669196200c84207e3eedd28a41cd695
parent82f6ff61d595cff9885e164c38991732469845aa (diff)
parentb0ed876d0a85dd676b005185fba895c2db616b20 (diff)
downloadrspamd-07ecd3fd88213a7ebe51715ad608b1e5585467e3.tar.gz
rspamd-07ecd3fd88213a7ebe51715ad608b1e5585467e3.zip
Merge pull request #164 from fatalbanana/master
Minor nonsense
-rw-r--r--conf/lua/hfilter.lua1
-rw-r--r--conf/lua/rspamd.lua2
-rw-r--r--conf/metrics.conf4
-rw-r--r--src/plugins/lua/rbl.lua2
4 files changed, 4 insertions, 5 deletions
diff --git a/conf/lua/hfilter.lua b/conf/lua/hfilter.lua
index d0594bc04..ad4488ae1 100644
--- a/conf/lua/hfilter.lua
+++ b/conf/lua/hfilter.lua
@@ -1,7 +1,6 @@
--[[
Copyright (c) 2011-2015, Vsevolod Stakhov <vsevolod@highsecure.ru>
Copyright (c) 2013-2015, Alexey Savelyev <info@homeweb.ru>
-Copyright (c) 2015, Andrew Lewis
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/conf/lua/rspamd.lua b/conf/lua/rspamd.lua
index 6043f243c..245f6ce6a 100644
--- a/conf/lua/rspamd.lua
+++ b/conf/lua/rspamd.lua
@@ -67,7 +67,7 @@ rspamd_config.R_EMPTY_IMAGE = function (task)
end
-- Date issues
-rspamd_config.DATE_NOT_EXISTS = function(task)
+rspamd_config.MISSING_DATE = function(task)
if rspamd_config:get_api_version() >= 5 then
if not task:get_header_raw('Date') then
return true
diff --git a/conf/metrics.conf b/conf/metrics.conf
index 780e3d0ce..229e0815c 100644
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -756,8 +756,8 @@ metric {
}
symbol {
weight = 1.0;
- description = "Message date is not exists";
- name = "DATE_NOT_EXISTS";
+ description = "Message date is missing";
+ name = "MISSING_DATE";
}
# hfilter symbols
symbol { weight = 4.00; name = "HFILTER_HELO_BAREIP"; description = "Helo host is bare ip"; }
diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua
index 5593bbefc..12b42f186 100644
--- a/src/plugins/lua/rbl.lua
+++ b/src/plugins/lua/rbl.lua
@@ -1,6 +1,6 @@
--[[
Copyright (c) 2011-2015, Vsevolod Stakhov <vsevolod@highsecure.ru>
-Copyright (c) 2014-2015, Andrew Lewis
+Copyright (c) 2013-2015, Andrew Lewis <nerf@judo.za.org>
All rights reserved.
Redistribution and use in source and binary forms, with or without