Browse Source

[Minor] Fix a455c65422 missing part

tags/2.3
Vsevolod Stakhov 4 years ago
parent
commit
626107bb0f
3 changed files with 6 additions and 2 deletions
  1. 1
    1
      src/libmime/message.h
  2. 4
    0
      src/libmime/mime_encoding.c
  3. 1
    1
      src/lua/lua_mimepart.c

+ 1
- 1
src/libmime/message.h View File

@@ -114,7 +114,7 @@ struct rspamd_mime_part {
#define RSPAMD_MIME_TEXT_PART_FLAG_BALANCED (1 << 1)
#define RSPAMD_MIME_TEXT_PART_FLAG_EMPTY (1 << 2)
#define RSPAMD_MIME_TEXT_PART_FLAG_HTML (1 << 3)
#define RSPAMD_MIME_TEXT_PART_FLAG_8BIT (1 << 4)
#define RSPAMD_MIME_TEXT_PART_FLAG_8BIT_RAW (1 << 4)
#define RSPAMD_MIME_TEXT_PART_FLAG_8BIT_ENCODED (1 << 5)
#define RSPAMD_MIME_TEXT_PART_HAS_SUBNORMAL (1 << 6)
#define RSPAMD_MIME_TEXT_PART_NORMALISED (1 << 7)

+ 4
- 0
src/libmime/mime_encoding.c View File

@@ -659,6 +659,10 @@ rspamd_mime_text_part_maybe_convert (struct rspamd_task *task,
rspamd_ftok_t charset_tok;
struct rspamd_mime_part *part = text_part->mime_part;

if (rspamd_str_has_8bit (text_part->raw.begin, text_part->raw.len)) {
text_part->flags |= RSPAMD_MIME_TEXT_PART_FLAG_8BIT_RAW;
}

/* Allocate copy storage */
part_content = g_byte_array_sized_new (text_part->parsed.len);
memcpy (part_content->data, text_part->parsed.begin, text_part->parsed.len);

+ 1
- 1
src/lua/lua_mimepart.c View File

@@ -625,7 +625,7 @@ lua_textpart_has_8bit_raw (lua_State * L)
struct rspamd_mime_text_part *part = lua_check_textpart (L);

if (part) {
if (part->flags & RSPAMD_MIME_TEXT_PART_FLAG_8BIT) {
if (part->flags & RSPAMD_MIME_TEXT_PART_FLAG_8BIT_RAW) {
lua_pushboolean (L, TRUE);
}
else {

Loading…
Cancel
Save