According to RFC2822 References and In-Reply-To headers are supposed
to contain one or more Message-IDs, however older RFC822 allowed
almost any content. When both References and In-Reply-To headers ends
with something else that a Message-ID (see e.g. [1]), the thread
structure presented by notmuch is incorrect. The reason is that
notmuch treats this case as if the email contained no "replyto"
information (see _notmuch_database_link_message_to_parents).
This patch changes the parse_references() function to return the last
valid Message-ID encountered rather than NULL resulting from the last
hunk of text not being the Message-ID.
[1] https://lkml.org/lkml/headers/2014/5/19/864
GHashTable *hash,
const char *refs)
{
GHashTable *hash,
const char *refs)
{
+ char *ref, *last_ref = NULL;
if (refs == NULL || *refs == '\0')
return NULL;
if (refs == NULL || *refs == '\0')
return NULL;
while (*refs) {
ref = _parse_message_id (ctx, refs, &refs);
while (*refs) {
ref = _parse_message_id (ctx, refs, &refs);
- if (ref && strcmp (ref, message_id))
+ if (ref && strcmp (ref, message_id)) {
g_hash_table_insert (hash, ref, NULL);
g_hash_table_insert (hash, ref, NULL);
}
/* The return value of this function is used to add a parent
* reference to the database. We should avoid making a message
}
/* The return value of this function is used to add a parent
* reference to the database. We should avoid making a message
- * its own parent, thus the following check.
+ * its own parent, thus the above check.
-
- if (ref && strcmp(ref, message_id)) {
- return ref;
- } else {
- return NULL;
- }
test_expect_equal_json "$output" "$expected"
test_begin_subtest "Ignore garbage at the end of References"
test_expect_equal_json "$output" "$expected"
test_begin_subtest "Ignore garbage at the end of References"
-test_subtest_known_broken
add_message '[id]="foo@five.com"' \
'[subject]="five"'
add_message '[id]="bar@five.com"' \
add_message '[id]="foo@five.com"' \
'[subject]="five"'
add_message '[id]="bar@five.com"' \