bb #497

git-svn: trunk@3077
18 years ago · 10af98a4bb
parent 0518e6c109
commit 10af98a4bb
2 changed files with 6 additions and 1 deletions
--- a/4
+++ b/4
@ -1,3 +1,7 @@
+Tue May 29 17:07:08 CEST 2007 (edwin)
+----------------------------------
+  * libclamav/phishcheck.c: bb #497
+
 Tue May 29 17:07:08 CEST 2007 (tk)
 ----------------------------------
  * docs: various fixes, thanks to Fabio Pedretti <pedretti*eco.unibs.it>
--- a/libclamav/phishcheck.c
+++ b/libclamav/phishcheck.c
@ -200,12 +200,13 @@ static const size_t https_len  = sizeof(https)-1;
 #define URI_xpalpha_nodot URI_xalpha_nodot"|\\+"
 #define URI_xpalphas "("URI_xpalpha")+"
 #define URI_xpalphas_nodot "("URI_xpalpha_nodot")+"
+#define optional_URI_xpalphas "("URI_xpalpha"|=)*"

 #define URI_scheme URI_ialpha
 #define URI_tld iana_tld
 #define URI_path1 URI_xpalphas_nodot"\\.("URI_xpalphas_nodot"\\.)*"
 #define URI_path2 URI_tld
-#define URI_path3 "(/("URI_xpalphas"/?)*)?"
+#define URI_path3 "(/"optional_URI_xpalphas")*"

 #define URI_search "("URI_xalphas"\\+)*"
 #define URI_fragmentid URI_xalphas