[BUG] [PATCH] Fix appending of Received headers

[BUG] [PATCH] Fix appending of Received headers

[Stewart Smith]

We're not properly concatenating the Received headers if we parse them
while requesting a header that isn't Received.

this fixes notmuch-reply address detection in a bunch of situations.

diff --git a/lib/message-file.c b/lib/message-file.c
index 7722832..dd0f698 100644
--- a/lib/message-file.c
+++ b/lib/message-file.c
@@ -329,7 +329,7 @@ notmuch_message_file_get_header (notmuch_message_file_t *message,
 	/* we treat the Received: header special - we want to concat ALL of 
 	 * the Received: headers we encounter.
 	 * for everything else we return the first instance of a header */
-	if (is_received) {
+	if (strcasecmp(header, "received") == 0) {
 	    if (header_sofar == NULL) {
 		/* first Received: header we encountered; just add it */
 		g_hash_table_insert (message->headers, header, decoded_value);

-- 
Stewart Smith

Re: [BUG] [PATCH] Fix appending of Received headers

[Carl Worth]

[-- Attachment #1: Type: text/plain, Size: 663 bytes --]

On Tue, 17 May 2011 12:10:32 +1000, Stewart Smith <stewart@flamingspork.com> wrote:
> We're not properly concatenating the Received headers if we parse them
> while requesting a header that isn't Received.

Thanks, Stewart. The fix looks clearly correct.

> this fixes notmuch-reply address detection in a bunch of situations.

But can we go one step beyond "a bunch of situations"? Could you send a
message that demonstrates this bug? Or better yet, extend the
test/from-guessing test case to expose the bug?

I'd prefer to fix the test suite here so that we don't later regress on
this behavior.

Thanks,

-Carl

-- 
carl.d.worth@intel.com

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: [BUG] [PATCH] Fix appending of Received headers

[Carl Worth]

[-- Attachment #1: Type: text/plain, Size: 691 bytes --]

On Tue, 24 May 2011 13:33:25 -0700, Carl Worth <cworth@cworth.org> wrote:
> On Tue, 17 May 2011 12:10:32 +1000, Stewart Smith <stewart@flamingspork.com> wrote:
> > We're not properly concatenating the Received headers if we parse them
> > while requesting a header that isn't Received.
...
> I'd prefer to fix the test suite here so that we don't later regress on
> this behavior.

I've done that now. What the test suite was missing was having messages
that actually had more than one Received header, (otherwise, no
concatenation was ever used in the testing).

The new test and the patch are both now pushed.

Thanks again, Stewart.

-Carl

-- 
carl.d.worth@intel.com

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: [BUG] [PATCH] Fix appending of Received headers

[Stewart Smith]

On Fri, 10 Jun 2011 17:22:50 -0700, Carl Worth <cworth@cworth.org> wrote:
Non-text part: multipart/signed
> On Tue, 24 May 2011 13:33:25 -0700, Carl Worth <cworth@cworth.org> wrote:
> > On Tue, 17 May 2011 12:10:32 +1000, Stewart Smith <stewart@flamingspork.com> wrote:
> > > We're not properly concatenating the Received headers if we parse them
> > > while requesting a header that isn't Received.
> ...
> > I'd prefer to fix the test suite here so that we don't later regress on
> > this behavior.
> 
> I've done that now. What the test suite was missing was having messages
> that actually had more than one Received header, (otherwise, no
> concatenation was ever used in the testing).
> 
> The new test and the patch are both now pushed.

Great and thanks! Sorry I didn't manage to get updating test suite to
the top of my TODO list.

-- 
Stewart Smith