diff options
| author | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2011-03-09 15:49:32 +0300 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2011-03-09 15:49:32 +0300 |
| commit | 8cc93b54959dc754b70698a2b397b3406dd7928e (patch) | |
| tree | e81f07f120011162cc5fd89c76e9aa4a332d2c5a | |
| parent | c9af649b3316857e77ec3509ca93c4a4ff37f477 (diff) | |
| download | rspamd-8cc93b54959dc754b70698a2b397b3406dd7928e.tar.gz rspamd-8cc93b54959dc754b70698a2b397b3406dd7928e.zip | |
Fix gmime24 compatibility.
Fix adding extra space to raw headers.
Reported by: Victor Ustugov
| -rw-r--r-- | rspamd.xml.sample | 4 | ||||
| -rw-r--r-- | src/lua/lua_task.c | 4 | ||||
| -rw-r--r-- | src/message.c | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/rspamd.xml.sample b/rspamd.xml.sample index 1a04eeaa9..52e497926 100644 --- a/rspamd.xml.sample +++ b/rspamd.xml.sample @@ -230,8 +230,6 @@ <symbol weight="1.00" description="SPF verification soft-failed">R_SPF_SOFTFAIL</symbol> <symbol weight="-3.00" description="SPF verification alowed">R_SPF_ALLOW</symbol> - <!-- Whitelisted client's IP --> - <symbol weight="-2.00" description="Whitelisted client's IP">WHITELIST_IP</symbol> <!-- Message seems to be from maillist --> <symbol weight="-2.00" description="Message seems to be from maillist">MAILLIST</symbol> @@ -371,10 +369,12 @@ </module> <!-- whitelist --> +<!-- Example of using HTTP maps for whitelisting <module name="whitelist"> <ip_whitelist>http://cebka.pp.ru/stuff/grey_whitelist.conf</ip_whitelist> <symbol_ip>WHITELIST_IP</symbol_ip> </module> +--> <!-- chartable --> <module name="chartable"> diff --git a/src/lua/lua_task.c b/src/lua/lua_task.c index 549bdc914..eb95f0258 100644 --- a/src/lua/lua_task.c +++ b/src/lua/lua_task.c @@ -731,9 +731,9 @@ lua_push_internet_address (lua_State *L, InternetAddressList *addrs) InternetAddressMailbox *iamb; lua_newtable (L); - len = internet_address_list_length (list); + len = internet_address_list_length (addrs); for (i = 0; i < len; i ++) { - ia = internet_address_list_get_address (list, i); + ia = internet_address_list_get_address (addrs, i); if (ia) { lua_newtable (L); iamb = INTERNET_ADDRESS_MAILBOX (ia); diff --git a/src/message.c b/src/message.c index b4ddde839..4f4627351 100644 --- a/src/message.c +++ b/src/message.c @@ -588,6 +588,10 @@ process_raw_headers (struct worker_task *task) } } } + /* Strip last space that can be added by \r\n parsing */ + if (*(tp - 1) == ' ') { + tp --; + } *tp = '\0'; new->value = tmp; task->raw_headers_list = g_list_prepend (task->raw_headers_list, new); |