浏览代码

[Fix] Fix init code for servers keypairs cache

tags/1.9.3
Vsevolod Stakhov 5 年前
父节点
当前提交
8d43514a53
共有 3 个文件被更改,包括 11 次插入11 次删除
  1. 8
    8
      src/libutil/http_connection.c
  2. 2
    2
      src/libutil/http_context.c
  3. 1
    1
      src/worker.c

+ 8
- 8
src/libutil/http_connection.c 查看文件

@@ -44,14 +44,14 @@ struct _rspamd_http_privbuf {
};

enum rspamd_http_priv_flags {
RSPAMD_HTTP_CONN_FLAG_ENCRYPTED = 1 << 0,
RSPAMD_HTTP_CONN_FLAG_NEW_HEADER = 1 << 1,
RSPAMD_HTTP_CONN_FLAG_RESETED = 1 << 2,
RSPAMD_HTTP_CONN_FLAG_TOO_LARGE = 1 << 3,
RSPAMD_HTTP_CONN_FLAG_ENCRYPTION_NEEDED = 1 << 4,
RSPAMD_HTTP_CONN_FLAG_PROXY = 1 << 5,
RSPAMD_HTTP_CONN_FLAG_PROXY_REQUEST = 1 << 6,
RSPAMD_HTTP_CONN_OWN_SOCKET = 1 << 7,
RSPAMD_HTTP_CONN_FLAG_ENCRYPTED = 1u << 0u,
RSPAMD_HTTP_CONN_FLAG_NEW_HEADER = 1u << 1u,
RSPAMD_HTTP_CONN_FLAG_RESETED = 1u << 2u,
RSPAMD_HTTP_CONN_FLAG_TOO_LARGE = 1u << 3u,
RSPAMD_HTTP_CONN_FLAG_ENCRYPTION_NEEDED = 1u << 4u,
RSPAMD_HTTP_CONN_FLAG_PROXY = 1u << 5u,
RSPAMD_HTTP_CONN_FLAG_PROXY_REQUEST = 1u << 6u,
RSPAMD_HTTP_CONN_OWN_SOCKET = 1u << 7u,
};

#define IS_CONN_ENCRYPTED(c) ((c)->flags & RSPAMD_HTTP_CONN_FLAG_ENCRYPTED)

+ 2
- 2
src/libutil/http_context.c 查看文件

@@ -182,8 +182,8 @@ rspamd_http_context_init (struct rspamd_http_context *ctx)
ctx->client_kp_cache = rspamd_keypair_cache_new (ctx->config.kp_cache_size_client);
}

if (ctx->config.kp_cache_size_client > 0) {
ctx->client_kp_cache = rspamd_keypair_cache_new (ctx->config.kp_cache_size_client);
if (ctx->config.kp_cache_size_server > 0) {
ctx->server_kp_cache = rspamd_keypair_cache_new (ctx->config.kp_cache_size_server);
}

if (ctx->config.client_key_rotate_time > 0 && ctx->ev_base) {

+ 1
- 1
src/worker.c 查看文件

@@ -576,7 +576,7 @@ init_worker (struct rspamd_config *cfg)
ctx,
G_STRUCT_OFFSET (struct rspamd_worker_ctx, encrypted_only),
0,
"Deprecated: always true now");
"Allow only encrypted connections");


rspamd_rcl_register_worker_option (cfg,

正在加载...
取消
保存