From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.204.20.129 with SMTP id f1cs56748bkb; Sun, 10 Oct 2010 14:11:31 -0700 (PDT) Received: by 10.42.183.203 with SMTP id ch11mr1281457icb.463.1286745090764; Sun, 10 Oct 2010 14:11:30 -0700 (PDT) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id s40si15674722ibg.87.2010.10.10.14.11.30; Sun, 10 Oct 2010 14:11:30 -0700 (PDT) Received-SPF: pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) client-ip=205.234.109.19; Authentication-Results: mx.google.com; spf=pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) smtp.mail=sup-devel-bounces@rubyforge.org Received: from rubyforge.org (rubyforge.org [127.0.0.1]) by rubyforge.org (Postfix) with ESMTP id C292C19783C8; Sun, 10 Oct 2010 17:11:29 -0400 (EDT) Received: from twice-irc.de (mx2.twice-irc.de [79.140.35.195]) by rubyforge.org (Postfix) with ESMTP id 437C61858354 for ; Sun, 10 Oct 2010 17:02:30 -0400 (EDT) Received: from midna.zekjur.net (midna.zekjur.net [IPv6:2001:4d88:1008:4242:21c:c0ff:fe7e:4776]) by twice-irc.de (Postfix) with ESMTPSA id A05F5166636; Sun, 10 Oct 2010 23:02:29 +0200 (CEST) Received: by midna.zekjur.net (Postfix, from userid 101) id EC2EC30D088; Sun, 10 Oct 2010 23:02:28 +0200 (CEST) From: Michael Stapelberg To: Rich Lane Date: Sun, 10 Oct 2010 23:02:28 +0200 Message-Id: <1286744439-sup-1534@midna.zekjur.net> User-Agent: Sup/git Content-Transfer-Encoding: 8bit Content-Type: multipart/mixed; boundary="=-1286744548-918934-28513-3624-1-=" MIME-Version: 1.0 Cc: sup-devel Subject: [sup-devel] [PATCH] Bugfix: fix regexp for detecting filename in Content-Disposition header X-BeenThere: sup-devel@rubyforge.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Sup developer discussion List-Id: Sup developer discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: sup-devel-bounces@rubyforge.org Errors-To: sup-devel-bounces@rubyforge.org --=-1286744548-918934-28513-3624-1-= Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Hi, quote from the commit message: In a message written in some Microsoft mail program (the only header is "X-MimeOLE: Produced By Microsoft Exchange V6.5"), the filename part of the Content-Disposition header spans multiple lines (due to the filename being very long and encoded in base64 due to the use of UTF-8): Content-Disposition: attachment; filename="=?utf-8?B?VGFnIGRlciBPZmZlbmVuIFTDvHIgZGVzIFByb2pla3Rl?= =?utf-8?B?cyBMZXJucGF0ZW5zY2hhZnRlbiBpbSBFbW1lcnRzZ3I=?= =?utf-8?B?dW5kLmRvY3g=?=" The previous regexp did not properly match the whole string, but only the first line. This is fixed by adding the 'm' option (to match newlines as characters) and using \z instead of $ ("end of string" instead of "end of line"). The same fix is also applied to the Content-Type header one line below. Best regards, Michael --=-1286744548-918934-28513-3624-1-= Content-Disposition: attachment; filename="0001-Bugfix-fix-regexp-for-detecting-filename-in-Content-.patch" Content-Type: application/octet-stream; name="0001-Bugfix-fix-regexp-for-detecting-filename-in-Content-.patch" Content-Transfer-Encoding: base64 RnJvbSA4YjM0YWUyYzJhYzdhZjA2NDdjOGFhNWMwYWQxMzVmMGVhZTQyY2Rj IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBNaWNoYWVsIFN0YXBl bGJlcmcgPG1pY2hhZWxAc3RhcGVsYmVyZy5kZT4KRGF0ZTogU3VuLCAxMCBP Y3QgMjAxMCAyMjozMDo0NiArMDIwMApTdWJqZWN0OiBbUEFUQ0hdIEJ1Z2Zp eDogZml4IHJlZ2V4cCBmb3IgZGV0ZWN0aW5nIGZpbGVuYW1lIGluIENvbnRl bnQtRGlzcG9zaXRpb24gaGVhZGVyCgpJbiBhIG1lc3NhZ2Ugd3JpdHRlbiBp biBzb21lIE1pY3Jvc29mdCBtYWlsIHByb2dyYW0gKHRoZSBvbmx5IGhlYWRl ciBpcwoiWC1NaW1lT0xFOiBQcm9kdWNlZCBCeSBNaWNyb3NvZnQgRXhjaGFu Z2UgVjYuNSIpLCB0aGUgZmlsZW5hbWUgcGFydCBvZgp0aGUgQ29udGVudC1E aXNwb3NpdGlvbiBoZWFkZXIgc3BhbnMgbXVsdGlwbGUgbGluZXMgKGR1ZSB0 byB0aGUgZmlsZW5hbWUKYmVpbmcgdmVyeSBsb25nIGFuZCBlbmNvZGVkIGlu IGJhc2U2NCBkdWUgdG8gdGhlIHVzZSBvZiBVVEYtOCk6CgpDb250ZW50LURp c3Bvc2l0aW9uOiBhdHRhY2htZW50OwogICAgICAgIGZpbGVuYW1lPSI9P3V0 Zi04P0I/VkdGbklHUmxjaUJQWm1abGJtVnVJRlREdkhJZ1pHVnpJRkJ5YjJw bGEzUmw/PQogICAgICAgID0/dXRmLTg/Qj9jeUJNWlhKdWNHRjBaVzV6WTJo aFpuUmxiaUJwYlNCRmJXMWxjblJ6WjNJPT89CiAgICAgICAgPT91dGYtOD9C P2RXNWtMbVJ2WTNnPT89IgoKVGhlIHByZXZpb3VzIHJlZ2V4cCBkaWQgbm90 IHByb3Blcmx5IG1hdGNoIHRoZSB3aG9sZSBzdHJpbmcsIGJ1dCBvbmx5IHRo ZQpmaXJzdCBsaW5lLiBUaGlzIGlzIGZpeGVkIGJ5IGFkZGluZyB0aGUgJ20n IG9wdGlvbiAodG8gbWF0Y2ggbmV3bGluZXMgYXMKY2hhcmFjdGVycykgYW5k IHVzaW5nIFx6IGluc3RlYWQgb2YgJCAoImVuZCBvZiBzdHJpbmciIGluc3Rl YWQgb2YgImVuZCBvZgpsaW5lIikuCgpUaGUgc2FtZSBmaXggaXMgYWxzbyBh cHBsaWVkIHRvIHRoZSBDb250ZW50LVR5cGUgaGVhZGVyIG9uZSBsaW5lIGJl bG93LgotLS0KIGxpYi9zdXAvbWVzc2FnZS5yYiB8ICAgIDggKysrKystLS0K IDEgZmlsZXMgY2hhbmdlZCwgNSBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2xpYi9zdXAvbWVzc2FnZS5yYiBiL2xpYi9z dXAvbWVzc2FnZS5yYgppbmRleCA2OTY2OWJkLi5jZjBlNTA1IDEwMDY0NAot LS0gYS9saWIvc3VwL21lc3NhZ2UucmIKKysrIGIvbGliL3N1cC9tZXNzYWdl LnJiCkBAIC00NzUsMTAgKzQ3NSwxMiBAQCBwcml2YXRlCiAgICAgICBlbmQK ICAgICBlbHNlCiAgICAgICBmaWxlbmFtZSA9Ci0gICAgICAgICMjIGZpcnN0 LCBwYXcgdGhyb3VnaCB0aGUgaGVhZGVycyBsb29raW5nIGZvciBhIGZpbGVu YW1lCi0gICAgICAgIGlmIG0uaGVhZGVyWyJDb250ZW50LURpc3Bvc2l0aW9u Il0gJiYgbS5oZWFkZXJbIkNvbnRlbnQtRGlzcG9zaXRpb24iXSA9fiAvZmls ZW5hbWU9Ij8oLio/W15cXF0pKCJ8O3wkKS8KKyAgICAgICAgIyMgZmlyc3Qs IHBhdyB0aHJvdWdoIHRoZSBoZWFkZXJzIGxvb2tpbmcgZm9yIGEgZmlsZW5h bWUuCisgICAgICAgICMjIFJGQyAyMTgzIChDb250ZW50LURpc3Bvc2l0aW9u KSBzcGVjaWZpZXMgdGhhdCBkaXNwb3NpdGlvbi1wYXJtcyBhcmUKKyAgICAg ICAgIyMgc2VwYXJhdGVkIGJ5ICI7Ii4gU28sIHdlIG1hdGNoIGV2ZXJ5dGhp bmcgdXAgdG8gIiBhbmQgOyAoaWYgcHJlc2VudCkuCisgICAgICAgIGlmIG0u aGVhZGVyWyJDb250ZW50LURpc3Bvc2l0aW9uIl0gJiYgbS5oZWFkZXJbIkNv bnRlbnQtRGlzcG9zaXRpb24iXSA9fiAvZmlsZW5hbWU9Ij8oLio/W15cXF0p KCJ8O3xceikvbQogICAgICAgICAgICQxCi0gICAgICAgIGVsc2lmIG0uaGVh ZGVyWyJDb250ZW50LVR5cGUiXSAmJiBtLmhlYWRlclsiQ29udGVudC1UeXBl Il0gPX4gL25hbWU9Ij8oLio/W15cXF0pKCJ8O3wkKS9pCisgICAgICAgIGVs c2lmIG0uaGVhZGVyWyJDb250ZW50LVR5cGUiXSAmJiBtLmhlYWRlclsiQ29u dGVudC1UeXBlIl0gPX4gL25hbWU9Ij8oLio/W15cXF0pKCJ8O3xceikvaW0K ICAgICAgICAgICAkMQogCiAgICAgICAgICMjIGhhdmVuJ3QgZm91bmQgb25l LCBidXQgaXQncyBhIG5vbi10ZXh0IG1lc3NhZ2UuIGZha2UKLS0gCjEuNy4x Cgo= --=-1286744548-918934-28513-3624-1-= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel --=-1286744548-918934-28513-3624-1-=--