From 6bc05a8bc835d38e7e245bb70ee748809f5277b2 Mon Sep 17 00:00:00 2001
From: Diogo Sousa <diogogsousa@gmail.com>
Date: Sun, 16 Jun 2013 02:57:38 +0100
Subject: Improved host matching in url: * Refined ipv4 addr * Added ipv6
addr
---
src/common/url.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/common/url.c b/src/common/url.c
index 6c429ed8..84c112d1 100644
--- a/src/common/url.c
+++ b/src/common/url.c
@@ -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 *
--
cgit 1.4.1