Modify URIPROTO to match RFC3986

Fixes #197

Author: olafz

patterns/grok-patterns

@@ -37,7 +37,7 @@ PATH (?:%{UNIXPATH}|%{WINPATH})
 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

spec/patterns/core_spec.rb

@@ -103,6 +103,26 @@
   end
 end
 
+describe "URIPROTO" do
+  let(:pattern) { 'URIPROTO' }
+
+  context "http is a valid URIPROTO" do
+    let(:value) { 'http' }
+
+    it "should match" do
+      expect(grok_match(pattern,value)).to pass
+    end
+  end
+
+  context "android-app is a valid URIPROTO" do
+    let(:value) { 'android-app' }
+
+    it "should match" do
+      expect(grok_match(pattern,value)).to pass
+    end
+  end
+end
+
 describe "URIPATH" do
   let(:pattern) { 'URIPATH' }