diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-06-15 09:21:03 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-06-15 09:21:03 +0100 |
| commit | 9aad3e020ba34916fd680fc157923d5d6906e1a2 (patch) | |
| tree | 6a8a245d7be35a2c0dff1d689c78decb3fbf96b6 /src/ragel | |
| parent | 5a70a9191f3d0901f03372fabec66634618c91a4 (diff) | |
| download | rspamd-9aad3e020ba34916fd680fc157923d5d6906e1a2.tar.gz rspamd-9aad3e020ba34916fd680fc157923d5d6906e1a2.zip | |
[Feature] Parse received timestamp
Diffstat (limited to 'src/ragel')
| -rw-r--r-- | src/ragel/smtp_date.rl | 8 | ||||
| -rw-r--r-- | src/ragel/smtp_received.rl | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/ragel/smtp_date.rl b/src/ragel/smtp_date.rl index d2efe61a6..da5872439 100644 --- a/src/ragel/smtp_date.rl +++ b/src/ragel/smtp_date.rl @@ -11,7 +11,7 @@ day_name = "Mon" | "Tue" | "Wed" | "Thu" | "Fri" | "Sat" | "Sun"; day_of_week = FWS? day_name; - day = FWS? digit_2+ FWS; + day = FWS? digit{1,2} FWS; month = "Jan" | "Feb" | "Mar" | "Apr" | "May" | "Jun" | "Jul" | "Aug" | "Sep" | "Oct" | "Nov" | "Dec"; @@ -20,8 +20,8 @@ hour = digit_2; minute = digit_2; second = digit_2; - time_of_day = hour ":" minute ( ":" second ); - zone = (FWS ( "+" |"_" ) digit_4); + time_of_day = hour ":" minute (":" second )?; + zone = FWS ("+" | "-") >Sign_Start %Sign_End digit_4; time = time_of_day zone; - date_time = (day_of_week ",")? date time CFWS?; + date_time = (day_of_week ",")? date time; }%%
\ No newline at end of file diff --git a/src/ragel/smtp_received.rl b/src/ragel/smtp_received.rl index 02e850c9b..8e1825855 100644 --- a/src/ragel/smtp_received.rl +++ b/src/ragel/smtp_received.rl @@ -40,6 +40,6 @@ For = CFWS "FOR"i FWS ( Path | Mailbox ) %For_End; Additional_Registered_Clauses = CFWS Atom FWS String; Opt_info = Via? With? ID? For? Additional_Registered_Clauses?; - Received = From_domain By_domain Opt_info CFWS? ";" FWS date_time >Date_Start %Date_End; + Received = From_domain By_domain Opt_info CFWS? ";" FWS date_time >Date_Start %Date_End CFWS?; }%% |