Skip to content

Regex expression #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eliefaart wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Regex expression #6

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd2cdf0
Update regex expression
Feb 24, 2015
c933545
Clean up comment
Feb 24, 2015
8f3f7c7
Update MessageBuilder.cs
Jul 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions MessageBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ internal static NameValueCollection ParseMailHeader(string header) {
private static NameValueCollection ParseMIMEField(string field) {
NameValueCollection coll = new NameValueCollection();
try {
MatchCollection matches = Regex.Matches(field, "([\\w\\-]+)=\"?([\\w\\-\\/\\.]+)");
MatchCollection matches = Regex.Matches(field, "([\\w\\-]+)=((['\"]).*?\\2|[^;\\n]*)");
foreach (Match m in matches)
coll.Add(m.Groups[1].Value, m.Groups[2].Value);
Match mvalue = Regex.Match(field, @"^\s*([\w\/]+)");
Expand All @@ -148,7 +148,7 @@ private static MailAddress[] ParseAddressList(string list) {
string[] addr = list.Split(',');
foreach (string a in addr) {
Match m = Regex.Match(a.Trim(),
@"(.*)\s*<?([A-Z0-9._%-]+@[A-Z0-9.-]+\.[A-Z]{2,4})>?",
@"(.*)\s*<?([A-Z0-9._%-]+@[A-Z0-9.-]+\.[A-Z]{2,})>?",
RegexOptions.IgnoreCase | RegexOptions.RightToLeft);
if (m.Success) {
// The above regex will erroneously match some illegal (very rare)
Expand Down Expand Up @@ -446,4 +446,4 @@ private static Bodypart BodypartFromMIME(MIMEPart mimePart) {
return p;
}
}
}
}