From bb617ccacd7fc46382d14034fdf0a8ccc34f8be3 Mon Sep 17 00:00:00 2001 From: RichardHitt Date: Tue, 15 Jan 2013 13:19:29 -0800 Subject: Prev called anything a URL! Reverted but slight DOMAIN change. --- src/common/url.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/url.c b/src/common/url.c index f3460aca..1f3277cd 100644 --- a/src/common/url.c +++ b/src/common/url.c @@ -333,10 +333,10 @@ do_an_re(const char *word,int *start, int *end, int *type) } /* Miscellaneous description --- */ -#define DOMAIN "([a-z0-9]|([a-z0-9][-a-z0-9]*[a-z0-9]))\\." -#define TLD "([a-z][-a-z0-9]*[a-z0-9])" +#define DOMAIN "[-a-z0-9]+(\\.[-a-z0-9]+)*\\." +#define TLD "[a-z][-a-z0-9]*[a-z]" #define IPADDR "[0-9]+(\\.[0-9]+){3}" -#define HOST "(" "(" "(" DOMAIN ")*" TLD ")" "|" IPADDR ")" +#define HOST "(" DOMAIN TLD "|" IPADDR ")" #define OPT_PORT "(:[1-9][0-9]{0,4})?" GRegex * -- cgit 1.4.1