Improved host matching in url:

* Refined ipv4 addr
 * Added ipv6 addr
This commit is contained in:
Diogo Sousa 2013-06-16 02:57:38 +01:00
parent 7ef8d0d443
commit 6bc05a8bc8

View File

@ -349,8 +349,9 @@ 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]+)*\\."
#define TLD "[a-z][-a-z0-9]*[a-z]"
#define IPADDR "[0-9]+(\\.[0-9]+){3}"
#define HOST "(" DOMAIN TLD "|" IPADDR ")"
#define IPADDR "[0-9]{1,3}(\\.[0-9]{1,3}){3}"
#define IPV6ADDR "([0-9a-f]{0,4}(:[0-9a-f]{0,4})*:){2}[0-9a-f]{0,4}(:[0-9a-f]{0,4})*"
#define HOST "(" DOMAIN TLD "|" IPADDR "|" IPV6ADDR ")"
#define OPT_PORT "(:[1-9][0-9]{0,4})?"
GRegex *