commit 46de8e9: Merge pull request #11 from rspamd/master

GitHub noreply at github.com
Tue Apr 16 11:14:06 UTC 2019


Author: heraklit256
Date: 2019-03-05 16:05:03 +0000
URL: https://github.com/rspamd/rspamd/commit/46de8e9f6e51dc44623f253f6a5fe9ecad3dc554

Merge pull request #11 from rspamd/master
merge upstream into local master

 .github/ISSUE_TEMPLATE.md                          |    6 +-
 CMakeLists.txt                                     |   17 +-
 conf/composites.conf                               |    2 +-
 contrib/http-parser/http_parser.c                  |    3 +-
 contrib/http-parser/http_parser.h                  |    4 +-
 contrib/librdns/util.c                             |   18 +-
 lualib/lua_cfg_transform.lua                       |    6 +
 lualib/lua_clickhouse.lua                          |   10 +-
 lualib/lua_dkim_tools.lua                          |   39 +-
 lualib/lua_ffi/init.lua                            |    1 +
 lualib/lua_selectors.lua                           |   21 +
 rules/html.lua                                     |   45 +-
 rules/regexp/misc.lua                              |    4 +-
 src/CMakeLists.txt                                 |   10 +-
 src/client/CMakeLists.txt                          |    1 -
 src/client/rspamc.c                                |   18 +-
 src/client/rspamdclient.c                          |   26 +-
 src/client/rspamdclient.h                          |   12 +-
 src/controller.c                                   |   31 +-
 src/fuzzy_storage.c                                |   56 +-
 src/libmime/content_type.c                         |   54 +-
 src/libmime/lang_detection.c                       |   19 +-
 src/libmime/message.c                              |    2 +-
 src/libmime/mime_headers.c                         |  109 +-
 src/libmime/mime_parser.c                          |   38 +-
 src/libmime/mime_parser.h                          |    1 +
 src/libserver/cfg_file.h                           |   21 +-
 src/libserver/cfg_rcl.c                            |  110 +-
 src/libserver/cfg_utils.c                          |   40 +-
 src/libserver/composites.c                         |    7 +-
 src/libserver/dkim.c                               |   26 +-
 src/libserver/dns.c                                |    2 +-
 src/libserver/dynamic_cfg.c                        |   27 +-
 src/libserver/fuzzy_backend_redis.c                |    8 +-
 src/libserver/html.c                               |   94 +-
 src/libserver/milter.c                             |   29 +-
 src/libserver/monitored.c                          |    6 +-
 src/libserver/protocol.c                           |    2 +-
 src/libserver/protocol.h                           |    2 +-
 src/libserver/rspamd_control.c                     |   46 +-
 src/libserver/rspamd_control.h                     |    2 +-
 src/libserver/rspamd_symcache.c                    |  156 +-
 src/libserver/rspamd_symcache.h                    |   13 +
 src/libserver/task.h                               |    2 +-
 src/libserver/url.c                                |  429 +++--
 src/libserver/url.h                                |   28 +-
 src/libserver/worker_util.c                        |   19 +-
 src/libserver/worker_util.h                        |    2 +-
 src/libstat/backends/redis_backend.c               |    6 +-
 src/libstat/learn_cache/redis_cache.c              |    2 +-
 src/libstat/stat_api.h                             |    1 +
 src/libstat/tokenizers/tokenizers.c                |   20 +-
 src/libutil/CMakeLists.txt                         |   52 +-
 src/libutil/addr.c                                 |  115 +-
 src/libutil/addr.h                                 |    7 +-
 src/libutil/http.h                                 |  578 ------
 src/libutil/{http.c => http_connection.c}          | 2025 +++-----------------
 src/libutil/http_connection.h                      |  251 +++
 src/libutil/http_context.c                         |  433 +++++
 src/libutil/http_context.h                         |   95 +
 src/libutil/http_message.c                         |  660 +++++++
 src/libutil/http_message.h                         |  221 +++
 src/libutil/http_private.h                         |   39 +-
 src/libutil/http_router.c                          |  555 ++++++
 src/libutil/http_router.h                          |  138 ++
 src/libutil/http_util.c                            |  513 +++++
 src/libutil/http_util.h                            |   48 +
 src/libutil/map.c                                  |   33 +-
 src/libutil/map.h                                  |    2 +-
 src/libutil/map_helpers.c                          |   63 +-
 src/libutil/map_helpers.h                          |    6 +-
 src/libutil/multipattern.c                         |   21 +-
 src/libutil/str_util.c                             |   73 +-
 src/libutil/str_util.h                             |   19 +
 src/libutil/upstream.c                             |   14 +-
 src/libutil/upstream.h                             |    9 +-
 src/libutil/uthash_strcase.h                       |   29 +-
 src/libutil/util.c                                 |  152 +-
 src/libutil/util.h                                 |    3 +
 src/lua/lua_config.c                               |  202 +-
 src/lua/lua_dns_resolver.c                         |    2 +
 src/lua/lua_html.c                                 |    3 +
 src/lua/lua_http.c                                 |   23 +-
 src/lua/lua_ip.c                                   |    5 +-
 src/lua/lua_map.c                                  |   14 +-
 src/lua/lua_task.c                                 |  115 +-
 src/lua/lua_upstream.c                             |    2 +-
 src/lua/lua_url.c                                  |   46 +-
 src/plugins/dkim_check.c                           |   23 +-
 src/plugins/fuzzy_check.c                          |   23 +-
 src/plugins/lua/arc.lua                            |    4 +-
 src/plugins/lua/dkim_signing.lua                   |   15 +-
 src/plugins/lua/mime_types.lua                     |    3 +-
 src/plugins/lua/multimap.lua                       |   81 +-
 src/plugins/lua/reputation.lua                     |   60 +-
 src/plugins/lua/rspamd_update.lua                  |   28 +-
 src/plugins/lua/settings.lua                       |    4 +
 src/plugins/surbl.c                                |   29 +-
 src/rspamadm/CMakeLists.txt                        |    1 -
 src/rspamadm/control.c                             |   27 +-
 src/rspamadm/dkim_keygen.c                         |  140 +-
 src/rspamadm/lua_repl.c                            |    8 +-
 src/rspamadm/rspamadm.c                            |    1 +
 src/rspamd.c                                       |    9 +-
 src/rspamd.h                                       |    3 +-
 src/rspamd_proxy.c                                 |  137 +-
 src/worker.c                                       |   23 +-
 src/worker_private.h                               |    2 +-
 test/CMakeLists.txt                                |    3 -
 test/functional/cases/106_mid.robot                |   42 +
 .../cases/131_dkim_signing/001_simple.robot        |    5 +
 test/functional/cases/231_tcp_down.robot           |    2 +-
 test/functional/configs/dkim_signing/simple.conf   |    2 +
 test/functional/configs/maps/mid.list              |    2 +
 test/functional/configs/mid.conf                   |    9 +
 test/functional/lua/dns.lua                        |    3 +-
 test/functional/lua/http.lua                       |    3 +-
 test/functional/lua/redis.lua                      |    8 +-
 test/functional/lua/tcp.lua                        |   10 +-
 test/functional/messages/invalid_mid_allowed.eml   |   10 +
 test/rspamd_http_test.c                            |    3 +-
 test/rspamd_test_suite.c                           |    2 +-
 test/rspamd_upstream_test.c                        |   22 +-
 123 files changed, 5499 insertions(+), 3467 deletions(-)


More information about the Commits mailing list