From 919329320ca0c4189389be83b357bdafa7ce12c8 Mon Sep 17 00:00:00 2001 From: Jordan Sissel Date: Tue, 13 Nov 2012 12:39:03 -0800 Subject: [PATCH] - Use atomic grouping for PATH and its siblings. Fixes LOGSTASH-701 --- patterns/grok-patterns | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/patterns/grok-patterns b/patterns/grok-patterns index 1eed81b04..48ca9813c 100755 --- a/patterns/grok-patterns +++ b/patterns/grok-patterns @@ -30,12 +30,12 @@ HOSTPORT (?:%{IPORHOST=~/\./}:%{POSINT}) # paths PATH (?:%{UNIXPATH}|%{WINPATH}) -UNIXPATH (?:/(?:[\w_%!$@:.,-]+|\\.)*)+ +UNIXPATH (?>/(?>[\w_%!$@:.,-]+|\\.)*)+ #UNIXPATH (?/dev/pts/%{NONNEGINT}) +BSDTTY (?>/dev/tty[pq][a-z0-9]) TTY (?:%{BSDTTY}|%{LINUXTTY}) -WINPATH (?:[A-Za-z]+:|\\)(?:\\[^\\?*]*)+ +WINPATH (?>[A-Za-z]+:|\\)(?:\\[^\\?*]*)+ URIPROTO [A-Za-z]+(\+[A-Za-z+]+)? URIHOST %{IPORHOST}(?::%{POSINT:port})? # uripath comes loosely from RFC1738, but mostly from what Firefox