[Minor] change headers for zstd and include pathtags/3.0
@@ -633,6 +633,7 @@ IF(SYSTEM_ZSTD MATCHES "OFF") | |||
ELSE() | |||
ProcessPackage(LIBZSTD LIBRARY zstd INCLUDE zstd.h | |||
ROOT ${LIBZSTD_ROOT_DIR} MODULES zstd) | |||
ADD_DEFINITIONS(-DSYS_ZSTD) | |||
ENDIF() | |||
IF(ENABLE_SNOWBALL MATCHES "ON") | |||
ADD_SUBDIRECTORY(contrib/snowball) |
@@ -19,7 +19,12 @@ | |||
#include "libserver/http/http_private.h" | |||
#include "libserver/protocol_internal.h" | |||
#include "unix-std.h" | |||
#include "contrib/zstd/zstd.h" | |||
#ifdef SYS_ZSTD | |||
# include "zstd.h" | |||
#else | |||
# include "contrib/zstd/zstd.h" | |||
#endif | |||
#ifdef HAVE_FETCH_H | |||
#include <fetch.h> |
@@ -36,8 +36,12 @@ | |||
#include "contrib/libottery/ottery.h" | |||
#include "contrib/fastutf8/fastutf8.h" | |||
#define ZSTD_STATIC_LINKING_ONLY | |||
#include "contrib/zstd/zstd.h" | |||
#ifdef SYS_ZSTD | |||
# include "zstd.h" | |||
#else | |||
# define ZSTD_STATIC_LINKING_ONLY | |||
# include "contrib/zstd/zstd.h" | |||
#endif | |||
#ifdef HAVE_OPENSSL | |||
#include <openssl/rand.h> |
@@ -23,10 +23,15 @@ | |||
#include "libserver/http/http_connection.h" | |||
#include "libserver/http/http_private.h" | |||
#include "rspamd.h" | |||
#include "contrib/zstd/zstd.h" | |||
#include "contrib/libev/ev.h" | |||
#include "contrib/uthash/utlist.h" | |||
#ifdef SYS_ZSTD | |||
# include "zstd.h" | |||
#else | |||
# include "contrib/zstd/zstd.h" | |||
#endif | |||
#undef MAP_DEBUG_REFS | |||
#ifdef MAP_DEBUG_REFS | |||
#define MAP_RETAIN(x, t) do { \ |
@@ -21,7 +21,6 @@ | |||
#include "worker_private.h" | |||
#include "libserver/cfg_file_private.h" | |||
#include "libmime/scan_result_private.h" | |||
#include "contrib/zstd/zstd.h" | |||
#include "lua/lua_common.h" | |||
#include "unix-std.h" | |||
#include "protocol_internal.h" | |||
@@ -30,6 +29,12 @@ | |||
#include "task.h" | |||
#include <math.h> | |||
#ifdef SYS_ZSTD | |||
# include "zstd.h" | |||
#else | |||
# include "contrib/zstd/zstd.h" | |||
#endif | |||
INIT_LOG_MODULE(protocol) | |||
#define msg_err_protocol(...) rspamd_default_log_function (G_LOG_LEVEL_CRITICAL, \ |
@@ -25,7 +25,6 @@ | |||
#include "stat_api.h" | |||
#include "unix-std.h" | |||
#include "utlist.h" | |||
#include "contrib/zstd/zstd.h" | |||
#include "libserver/mempool_vars_internal.h" | |||
#include "libserver/cfg_file_private.h" | |||
#include "libmime/lang_detection.h" | |||
@@ -41,6 +40,12 @@ | |||
#include <math.h> | |||
#ifdef SYS_ZSTD | |||
# include "zstd.h" | |||
#else | |||
# include "contrib/zstd/zstd.h" | |||
#endif | |||
__KHASH_IMPL (rspamd_req_headers_hash, static inline, | |||
rspamd_ftok_t *, struct rspamd_request_header_chain *, 1, | |||
rspamd_ftok_icase_hash, rspamd_ftok_icase_equal) | |||
@@ -1981,4 +1986,4 @@ rspamd_worker_guard_handler (EV_P_ ev_io *w, int revents) | |||
return; | |||
} | |||
} | |||
} | |||
} |
@@ -16,10 +16,16 @@ | |||
#include "lua_common.h" | |||
#include "unix-std.h" | |||
#include "contrib/zstd/zstd.h" | |||
#include "contrib/zstd/error_public.h" | |||
#include <zlib.h> | |||
#ifdef SYS_ZSTD | |||
# include "zstd.h" | |||
# include "zstd_errors.h" | |||
#else | |||
# include "contrib/zstd/zstd.h" | |||
# include "contrib/zstd/error_public.h" | |||
#endif | |||
/*** | |||
* @module rspamd_compress | |||
* This module contains compression/decompression routines (zstd and zlib currently) | |||
@@ -614,4 +620,4 @@ luaopen_compress (lua_State *L) | |||
lua_pop (L, 2); | |||
rspamd_lua_add_preload (L, "rspamd_zstd", lua_load_zstd); | |||
} | |||
} |
@@ -36,7 +36,6 @@ | |||
#include "libserver/milter.h" | |||
#include "libserver/milter_internal.h" | |||
#include "libmime/lang_detection.h" | |||
#include "contrib/zstd/zstd.h" | |||
#include <math.h> | |||
@@ -44,6 +43,12 @@ | |||
#include <netinet/tcp.h> /* for TCP_NODELAY */ | |||
#endif | |||
#ifdef SYS_ZSTD | |||
# include "zstd.h" | |||
#else | |||
# include "contrib/zstd/zstd.h" | |||
#endif | |||
/* Rotate keys each minute by default */ | |||
#define DEFAULT_ROTATION_TIME 60.0 | |||
#define DEFAULT_RETRIES 5 |