]> source.dussan.org Git - rspamd.git/commitdiff
* Parse days and hours in time limits
authorVsevolod Stakhov <vsevolod@rambler-co.ru>
Fri, 30 Oct 2009 15:49:36 +0000 (18:49 +0300)
committerVsevolod Stakhov <vsevolod@rambler-co.ru>
Fri, 30 Oct 2009 15:49:36 +0000 (18:49 +0300)
src/cfg_file.l

index f3baff15d2c3dd1a9df0de3e41abb94475f9fbca..822cab3fae9914a4ff2978ca439ad06cbb1bebef 100644 (file)
@@ -114,7 +114,7 @@ yes|YES|no|NO|[yY]|[nN]                     yylval.flag=parse_flag(yytext); return FLAG;
 [0-9]+                                                 yylval.number=strtol(yytext, NULL, 10); return NUMBER;
 -?[0-9]+\.?[0-9]*                              yylval.fract=strtod(yytext, NULL); return FRACT;
 [0-9]+[kKmMgG]?                                        yylval.limit=parse_limit(yytext); return SIZELIMIT;
-[0-9]+[sS]|[0-9]+[mM][sS]              yylval.seconds=parse_seconds(yytext); return SECONDS;
+[0-9]+[mMsShHdD]?                              yylval.seconds=parse_seconds(yytext); return SECONDS;
 [0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3} yylval.string=strdup(yytext); return IPADDR;
 [0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\/[0-9]{1,2}     yylval.string=strdup(yytext); return IPNETWORK;
 [*a-zA-Z0-9.-]+:[0-9]{1,5}             yylval.string=strdup(yytext); return HOSTPORT;