From e3671e1d6f4e98a987245f8b831ba4e34a908701 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Fri, 21 Sep 2012 17:41:06 -0400 Subject: [PATCH] follow the url spec for url path characters --- url_regex.hh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/url_regex.hh b/url_regex.hh index 816f6a8..355b083 100644 --- a/url_regex.hh +++ b/url_regex.hh @@ -7,11 +7,9 @@ #define HOSTCHARS_CLASS "[-[:alnum:]]" #define HOST "(?:" HOSTCHARS_CLASS "+(\\." HOSTCHARS_CLASS "+)*)?" #define PORT "(?:\\:[[:digit:]]{1,5})?" -#define PATHCHARS_CLASS "[-[:alnum:]\\Q_$.+!*,;@&=?/~#%\\E]" -#define PATHTERM_CLASS "[^\\Q]'.}>) \t\r\n,\"\\E]" #define SCHEME "(?:[[:alpha:]][+-.[:alnum:]]*:)" #define USERPASS USERCHARS_CLASS "+(?:" PASSCHARS_CLASS "+)?" -#define URLPATH "(?:(/" PATHCHARS_CLASS "+(?:[(]" PATHCHARS_CLASS "*[)])*" PATHCHARS_CLASS "*)*" PATHTERM_CLASS ")?" +#define URLPATH "(?:/[[:alnum:]$-_.+!*'(),;/?:@&=]*)" const char * const url_regex = SCHEME "//(?:" USERPASS "\\@)?" HOST PORT URLPATH;