Merge branch 'master' into pull350

This commit is contained in:
RichardHitt 2013-01-16 15:39:55 -08:00
commit 82026be00a
1 changed files with 3 additions and 2 deletions

View File

@ -333,9 +333,10 @@ 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-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 IPADDR "[0-9]+(\\.[0-9]+){3}"
#define HOST "(" DOMAIN "|" IPADDR ")" #define HOST "(" DOMAIN TLD "|" IPADDR ")"
#define OPT_PORT "(:[1-9][0-9]{0,4})?" #define OPT_PORT "(:[1-9][0-9]{0,4})?"
GRegex * GRegex *