Project

General

Profile

Actions

Patch #17718

closed

Body delimiters to truncate emails do not take uncommon whitespace into account

Added by Holger Just over 10 years ago. Updated over 7 years ago.

Status:
Closed
Priority:
Normal
Assignee:
-
Category:
Email receiving
Target version:
Start date:
Due date:
% Done:

0%

Estimated time:

Description

The function which truncate emails after a certain delimiter was found (i.e. MailHandler#cleanup_body) currently does not take trailing whitespace into account that is not part of \s. This e.g. includes non-breaking spaces which are common after e.g. signature delimiters (hyphen hyphen no-break-space).

This results in delimiters being not taken into account if there are these unicode whitespace characters at the end of the line.

The attached patch fixes this for Ruby versions >= 1.9. I have found no generally reliable way to fix this for Ruby 1.8 which thus retains the previous behavior. The reason this only works on Ruby >= 1.9 is that only this version includes a possibility to match unicode whitespace. Ruby 1.8 only has a limited list of ASCII characters (against the unicode spec apparently).

Given that I can't change the behavior on 1.8, this change is unfortunately rather difficult to test. I have also attached a patch with improved tests which work properly on 1.9 and 2.0 but breaks on 1.8 as it doesn't recognize the change in behavior. Given that, I'd rather prefer to pull the improvement of behavior without the test than to hold everything out...


Files

Actions

Also available in: Atom PDF