SoniEx2
/
c.sexchat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #680 from staticshock/dotless-domains 

Permit dot-less domain names
This commit is contained in:
Diogo Sousa 2013-07-19 09:23:52 -07:00
parent 2e2f4662f3 bca972bdc3
commit fe86c4900f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/url.c
View File

@ -350,8 +350,8 @@ do_an_re(const char *word, int *start, int *end, int *type)
} }
/* Miscellaneous description --- */ /* Miscellaneous description --- */
#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 IPV6GROUP "([0-9a-f]{0,4})" #define IPV6GROUP "([0-9a-f]{0,4})"
#define IPV6ADDR "((" IPV6GROUP "(:" IPV6GROUP "){7})" \ #define IPV6ADDR "((" IPV6GROUP "(:" IPV6GROUP "){7})" \
@ -359,6 +359,7 @@ do_an_re(const char *word, int *start, int *end, int *type)
#define HOST "(" DOMAIN TLD "|" IPADDR "|" IPV6ADDR ")" #define HOST "(" DOMAIN TLD "|" IPADDR "|" IPV6ADDR ")"
/* In urls the IPv6 must be enclosed in square brackets */ /* In urls the IPv6 must be enclosed in square brackets */
#define HOST_URL "(" DOMAIN TLD "|" IPADDR "|" "\\[" IPV6ADDR "\\]" ")" #define HOST_URL "(" DOMAIN TLD "|" IPADDR "|" "\\[" IPV6ADDR "\\]" ")"
#define HOST_URL_OPT_TLD "(" DOMAIN "|" HOST_URL ")"
#define PORT "(:[1-9][0-9]{0,4})" #define PORT "(:[1-9][0-9]{0,4})"
#define OPT_PORT "(" PORT ")?" #define OPT_PORT "(" PORT ")?"
@ -517,7 +518,7 @@ re_url (void)
g_string_append (grist_gstr, USERINFO "?"); g_string_append (grist_gstr, USERINFO "?");
if (uri[i].flags & URI_AUTHORITY) if (uri[i].flags & URI_AUTHORITY)
g_string_append (grist_gstr, HOST_URL OPT_PORT); g_string_append (grist_gstr, HOST_URL_OPT_TLD OPT_PORT);
if (uri[i].flags & URI_PATH) if (uri[i].flags & URI_PATH)
{ {