From 42228b92e57e27a5af566496bd585afde5cbb07c Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Thu, 22 Apr 2021 12:51:20 +0100 Subject: [Minor] Rspamc: Detect zstd input automatically --- src/client/rspamdclient.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/client/rspamdclient.c b/src/client/rspamdclient.c index bcb25672e..9a2e7f88d 100644 --- a/src/client/rspamdclient.c +++ b/src/client/rspamdclient.c @@ -372,6 +372,10 @@ rspamd_client_command (struct rspamd_client_connection *conn, } if (!compressed) { + /* Detect zstd input */ + if (input->len > 4 && memcmp (input->str, "\x28\xb5\x2f\xfd", 4) == 0) { + compressed = TRUE; + } body = rspamd_fstring_new_init (input->str, input->len); } else { @@ -391,18 +395,6 @@ rspamd_client_command (struct rspamd_client_connection *conn, } dict_id = -1; - - if (dict_id == 0) { - g_set_error (err, RCLIENT_ERROR, errno, - "cannot open dictionary %s: %s", - comp_dictionary, - strerror (errno)); - g_free (req); - g_string_free (input, TRUE); - munmap (dict, dict_len); - - return FALSE; - } } body = rspamd_fstring_sized_new (ZSTD_compressBound (input->len)); -- cgit v1.2.3