diff options
| author | RichardHitt <rbh00@netcom.com> | 2013-01-16 15:39:55 -0800 |
|---|---|---|
| committer | RichardHitt <rbh00@netcom.com> | 2013-01-16 15:39:55 -0800 |
| commit | 82026be00a1e2e8f4cf8ed5ee6060be270cfa4e7 (patch) | |
| tree | e324aa90a9b3f15a0b0bc071b4a53515cb492069 /src/common/url.c | |
| parent | bf673072e8457b60a5a8c8d0adf53fa3ccb71ea6 (diff) | |
| parent | 7bc0e017f6de8a8f05e9d6202fe8737e2eb75c60 (diff) | |
Merge branch 'master' into pull350
Diffstat (limited to 'src/common/url.c')
| -rw-r--r-- | src/common/url.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/common/url.c b/src/common/url.c index 0ee09988..89047511 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]*(\\.[-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 * |