commit 4490696: [Minor] Restore smtp address parser machine
Vsevolod Stakhov
vsevolod at highsecure.ru
Thu Feb 7 15:14:18 UTC 2019
Author: Vsevolod Stakhov
Date: 2019-02-07 15:08:14 +0000
URL: https://github.com/rspamd/rspamd/commit/44906967dd5c09a22dc4bdb599681bc155bfffd3
[Minor] Restore smtp address parser machine
---
src/ragel/smtp_addr_parser.rl | 2 --
src/ragel/smtp_address.rl | 4 +---
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/ragel/smtp_addr_parser.rl b/src/ragel/smtp_addr_parser.rl
index 9ae7c5173..b5b4863d3 100644
--- a/src/ragel/smtp_addr_parser.rl
+++ b/src/ragel/smtp_addr_parser.rl
@@ -2,8 +2,6 @@
machine smtp_addr_parser;
-
-
action IP6_start {}
action IP6_end {}
action IP4_start {}
diff --git a/src/ragel/smtp_address.rl b/src/ragel/smtp_address.rl
index 3f03d405b..68226f748 100644
--- a/src/ragel/smtp_address.rl
+++ b/src/ragel/smtp_address.rl
@@ -28,10 +28,8 @@
QcontentSMTP = qtextSMTP | quoted_pairSMTP %User_has_backslash;
Quoted_string = ( DQUOTE QcontentSMTP* >User_start %User_end DQUOTE ) %Quoted_addr;
Local_part = Dot_string >User_start %User_end | Quoted_string;
- String = Atom | Quoted_string;
-
Mailbox = Local_part "@" (address_literal | Domain >Domain_start %Domain_end);
- UnangledPath = ( Adl ":" )? Mailbox >Domain_start %Addr_end "."?;
+ UnangledPath = ( Adl ":" )? Mailbox >Addr_start %Addr_end "."?;
AngledPath = "<" UnangledPath ">" %Addr_has_angle;
Path = AngledPath | UnangledPath;
SMTPAddr = space* (Path | "<>" %Empty_addr ) %Valid_addr space*;
More information about the Commits
mailing list