Refined IPv6 address matching in url.c.
This commit is contained in:
parent
32dee82c58
commit
e4b6f4b375
|
@ -350,7 +350,9 @@ do_an_re(const char *word,int *start, int *end, int *type)
|
||||||
#define DOMAIN "[a-z0-9][-a-z0-9]*(\\.[-a-z0-9]+)*\\."
|
#define DOMAIN "[a-z0-9][-a-z0-9]*(\\.[-a-z0-9]+)*\\."
|
||||||
#define TLD "[a-z][-a-z0-9]*[a-z]"
|
#define TLD "[a-z][-a-z0-9]*[a-z]"
|
||||||
#define IPADDR "[0-9]{1,3}(\\.[0-9]{1,3}){3}"
|
#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 IPV6GROUP "([0-9a-f]{0,4})"
|
||||||
|
#define IPV6ADDR "((" IPV6GROUP "(:" IPV6GROUP "){7})" \
|
||||||
|
"|(" IPV6GROUP "(:" IPV6GROUP ")*:(:" IPV6GROUP ")+))" /* with :: compression */
|
||||||
#define HOST "(" DOMAIN TLD "|" IPADDR "|" IPV6ADDR ")"
|
#define HOST "(" DOMAIN TLD "|" IPADDR "|" IPV6ADDR ")"
|
||||||
#define OPT_PORT "(:[1-9][0-9]{0,4})?"
|
#define OPT_PORT "(:[1-9][0-9]{0,4})?"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue