|
|
@@ -33,21 +33,21 @@ HOSTPORT %{IPORHOST}:%{POSINT}
|
|
|
|
|
|
# paths
|
|
|
PATH (?:%{UNIXPATH}|%{WINPATH})
|
|
|
-UNIXPATH (/([\w_%!$@:.,~-]+|\\.)*)+
|
|
|
+UNIXPATH (/([\w_%!$@:.,+~-]+|\\.)*)+
|
|
|
TTY (?:/dev/(pts|tty([pq])?)(\w+)?/?(?:[0-9]+))
|
|
|
WINPATH (?>[A-Za-z]+:|\\)(?:\\[^\\?*]*)+
|
|
|
-URIPROTO [A-Za-z]+(\+[A-Za-z+]+)?
|
|
|
+URIPROTO [A-Za-z]([A-Za-z0-9+\-.]+)+
|
|
|
URIHOST %{IPORHOST}(?::%{POSINT:port})?
|
|
|
# uripath comes loosely from RFC1738, but mostly from what Firefox
|
|
|
# doesn't turn into %XX
|
|
|
-URIPATH (?:/[A-Za-z0-9$.+!*'(){},~:;=@#%_\-]*)+
|
|
|
+URIPATH (?:/[A-Za-z0-9$.+!*'(){},~:;=@#%&_\-]*)+
|
|
|
#URIPARAM \?(?:[A-Za-z0-9]+(?:=(?:[^&]*))?(?:&(?:[A-Za-z0-9]+(?:=(?:[^&]*))?)?)*)?
|
|
|
URIPARAM \?[A-Za-z0-9$.+!*'|(){},~@#%&/=:;_?\-\[\]<>]*
|
|
|
URIPATHPARAM %{URIPATH}(?:%{URIPARAM})?
|
|
|
URI %{URIPROTO}://(?:%{USER}(?::[^@]*)?@)?(?:%{URIHOST})?(?:%{URIPATHPARAM})?
|
|
|
|
|
|
# Months: January, Feb, 3, 03, 12, December
|
|
|
-MONTH \b(?:Jan(?:uary|uar)?|Feb(?:ruary|ruar)?|M(?:a|ä)?r(?:ch|z)?|Apr(?:il)?|Ma(?:y|i)?|Jun(?:e|i)?|Jul(?:y)?|Aug(?:ust)?|Sep(?:tember)?|O(?:c|k)?t(?:ober)?|Nov(?:ember)?|De(?:c|z)(?:ember)?)\b
|
|
|
+MONTH \b(?:[Jj]an(?:uary|uar)?|[Ff]eb(?:ruary|ruar)?|[Mm](?:a|ä)?r(?:ch|z)?|[Aa]pr(?:il)?|[Mm]a(?:y|i)?|[Jj]un(?:e|i)?|[Jj]ul(?:y)?|[Aa]ug(?:ust)?|[Ss]ep(?:tember)?|[Oo](?:c|k)?t(?:ober)?|[Nn]ov(?:ember)?|[Dd]e(?:c|z)(?:ember)?)\b
|
|
|
MONTHNUM (?:0?[1-9]|1[0-2])
|
|
|
MONTHNUM2 (?:0[1-9]|1[0-2])
|
|
|
MONTHDAY (?:(?:0[1-9])|(?:[12][0-9])|(?:3[01])|[1-9])
|
|
|
@@ -71,7 +71,7 @@ ISO8601_HOUR (?:2[0123]|[01][0-9])
|
|
|
TIMESTAMP_ISO8601 %{YEAR}-%{MONTHNUM}-%{MONTHDAY}[T ]%{ISO8601_HOUR}:?%{MINUTE}(?::?%{SECOND})?%{ISO8601_TIMEZONE}?
|
|
|
DATE %{DATE_US}|%{DATE_EU}
|
|
|
DATESTAMP %{DATE}[- ]%{TIME}
|
|
|
-TZ (?:[PMCE][SD]T|UTC)
|
|
|
+TZ (?:[APMCE][SD]T|UTC)
|
|
|
DATESTAMP_RFC822 %{DAY} %{MONTH} %{MONTHDAY} %{YEAR} %{TIME} %{TZ}
|
|
|
DATESTAMP_RFC2822 %{DAY}, %{MONTHDAY} %{MONTH} %{YEAR} %{TIME} %{ISO8601_TIMEZONE}
|
|
|
DATESTAMP_OTHER %{DAY} %{MONTH} %{MONTHDAY} %{TIME} %{TZ} %{YEAR}
|
austintp