From be2d100d2d06c3ea31934fea30289bc1c88343ea Mon Sep 17 00:00:00 2001 From: RichardHitt Date: Mon, 14 Jan 2013 12:33:08 -0800 Subject: [PATCH] Parse url according to rfc 1738: add separate define for TLD. --- src/common/url.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/url.c b/src/common/url.c index 0ee09988..1f3277cd 100644 --- a/src/common/url.c +++ b/src/common/url.c @@ -333,9 +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-z]+" +#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 "|" IPADDR ")" +#define HOST "(" DOMAIN TLD "|" IPADDR ")" #define OPT_PORT "(:[1-9][0-9]{0,4})?" GRegex *