From fa2cd48637c1622ba7dea107898cb2fd0bc79a8e Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Tue, 20 Aug 2013 10:40:03 +2000 Subject: [PATCH] [PATCH v2] test: Canonicalize RFC 2047 encoding and charset --- 67/a7141d4de540240d414d0a797f1df6b0f5932a | 107 ++++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 67/a7141d4de540240d414d0a797f1df6b0f5932a diff --git a/67/a7141d4de540240d414d0a797f1df6b0f5932a b/67/a7141d4de540240d414d0a797f1df6b0f5932a new file mode 100644 index 000000000..647242bf5 --- /dev/null +++ b/67/a7141d4de540240d414d0a797f1df6b0f5932a @@ -0,0 +1,107 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 32D41429E59 + for ; Mon, 19 Aug 2013 07:40:21 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id TPdaOAtA-UJn for ; + Mon, 19 Aug 2013 07:40:15 -0700 (PDT) +Received: from dmz-mailsec-scanner-8.mit.edu (dmz-mailsec-scanner-8.mit.edu + [18.7.68.37]) + by olra.theworths.org (Postfix) with ESMTP id 0468B431E62 + for ; Mon, 19 Aug 2013 07:40:14 -0700 (PDT) +X-AuditID: 12074425-b7f0c8e000000953-5e-52122e4ec1fc +Received: from mailhub-auth-4.mit.edu ( [18.7.62.39]) + by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP + id 8F.C8.02387.E4E22125; Mon, 19 Aug 2013 10:40:14 -0400 (EDT) +Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) + by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id r7JEeBY7003586; + Mon, 19 Aug 2013 10:40:12 -0400 +Received: from drake.dyndns.org + (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com + [216.15.114.40]) (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r7JEe81T028340 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Mon, 19 Aug 2013 10:40:10 -0400 +Received: from amthrax by drake.dyndns.org with local (Exim 4.77) + (envelope-from ) + id 1VBQcq-0003lQ-1g; Mon, 19 Aug 2013 10:40:08 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH v2] test: Canonicalize RFC 2047 encoding and charset +Date: Mon, 19 Aug 2013 10:40:03 -0400 +Message-Id: <1376923203-14406-1-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: +References: +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFrrIIsWRmVeSWpSXmKPExsUixG6nruunJxRk0HFX1uJGazejRdN0Z4vr + N2cyW7xZOY/VgcXj8NeFLB637r9m93i26hazx5ZD75kDWKK4bFJSczLLUov07RK4MpbMe8NS + 0MpV8eriYdYGxjUcXYycHBICJhLrD/5khbDFJC7cW8/WxcjFISSwj1Fi589lLBDORkaJg6ve + sEM4d5gkFqz+zArhzGWUOHqonQ2kn01AQ2Lb/uWMILaIgLTEzruzweYyC6RLdG77zQxiCwu4 + SMy5844JxGYRUJU4++gTWC+vgINE97mpUHcoSnQ/mwAW5xQwkGg4sIEFxBYS0JdY8/8Q4wRG + /gWMDKsYZVNyq3RzEzNzilOTdYuTE/PyUot0LfRyM0v0UlNKNzGCQ85FdQfjhENKhxgFOBiV + eHg7lISChFgTy4orcw8xSnIwKYnyvtYCCvEl5adUZiQWZ8QXleakFh9ilOBgVhLh/coOlONN + SaysSi3Kh0lJc7AoifM+f3o2UEggPbEkNTs1tSC1CCYrw8GhJME7UReoUbAoNT21Ii0zpwQh + zcTBCTKcB2i4P0gNb3FBYm5xZjpE/hSjopQ471SQhABIIqM0D64XlhJeMYoDvSLMWwhSxQNM + J3Ddr4AGMwENnq0BNrgkESEl1cCo6SV5WGh2wHI9tdor5c5JL39y9RnOr8zb/yH02/ZVvrxq + H1frJrYrnAz8KfF7ZeEu8Ujrp4o21RteuR25yPi/n8NHVnSaUbEZA5dvcXifpkNoofHLrfkR + Eznnq+V6ndBzTzfS7TePWTZj9/y3ZfnmAm57lyiuzmfQ2JJydeKl6olMDFX/zZVYijMSDbWY + i4oTAbf+MdTkAgAA +Cc: tomi.ollila@iki.fi +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Mon, 19 Aug 2013 14:40:21 -0000 + +RFC 2047 states that the encoding and charset in an encoded word are +case-insensitive, so force them to lower case in the reply test. This +fixes an issue caused by GMime versions (somewhere between 2.6.10 and +2.6.16), which changed the capitalization of the encoding. +--- + test/reply | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/test/reply b/test/reply +index d4389cf..b0d854a 100755 +--- a/test/reply ++++ b/test/reply +@@ -201,12 +201,14 @@ add_message '[subject]="=?iso-8859-1?q?=e0=df=e7?="' \ + '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ + '[body]="Encoding"' + +-output=$(notmuch reply id:${gen_msg_id}) +-# Note that GMime changes from Q- to B-encoding ++# GMime happens to change from Q- to B-encoding. We canonicalize the ++# case of the encoding and charset because different versions of GMime ++# capitalize the encoding differently. ++output=$(notmuch reply id:${gen_msg_id} | perl -pe 's/=\?[^?]+\?[bB]\?/lc($&)/ge') + test_expect_equal "$output" "\ + From: Notmuch Test Suite + Subject: Re: =?iso-8859-1?b?4N/n?= +-To: =?UTF-8?b?4piD?= ++To: =?utf-8?b?4piD?= + In-Reply-To: <${gen_msg_id}> + References: <${gen_msg_id}> + +-- +1.7.10.4 + -- 2.26.2