Merge pull request #470 from q--/Use_non-capturing_groups_where_appropriate

Use non-capturing groups where appropriate
main
Elbert Alias 11 years ago
commit 007e670795

@ -223,7 +223,7 @@
"ATEN": { "ATEN": {
"website": "www.aten.com", "website": "www.aten.com",
"cats": [ 22 ], "cats": [ 22 ],
"headers": { "Server": "ATEN HTTP Server(\\(V?([\\d\\.]+)\\))?\\;version:\\2" } "headers": { "Server": "ATEN HTTP Server(?:\\(V?(?:[\\d\\.]+)\\))?\\;version:\\1" }
}, },
"ATG Web Commerce": { "ATG Web Commerce": {
"website": "oracle.com/us/products/applications/web-commerce/atg", "website": "oracle.com/us/products/applications/web-commerce/atg",
@ -818,7 +818,7 @@
"eHTTP": { "eHTTP": {
"website": "???", "website": "???",
"cats": [ 22 ], "cats": [ 22 ],
"headers": { "Server": "\\beHTTP( v?([\\d\\.]+))?\\;version:\\2" }, "headers": { "Server": "\\beHTTP(?: v?([\\d\\.]+))?\\;version:\\1" },
"implies": [ "HP ProCurve"] "implies": [ "HP ProCurve"]
}, },
"ELOG": { "ELOG": {
@ -889,7 +889,7 @@
"EWS-NIC4": { "EWS-NIC4": {
"website": "dell.com", "website": "dell.com",
"cats": [ 22 ], "cats": [ 22 ],
"headers": { "Server": "EWS-NIC4(\\/([\\d\\.a-z]+))?\\;version:\\2" }, "headers": { "Server": "EWS-NIC4(?:\\/([\\d\\.a-z]+))?\\;version:\\1" },
"implies": "Dell" "implies": "Dell"
}, },
"Exhibit": { "Exhibit": {
@ -1169,7 +1169,7 @@
"Highstock": { "Highstock": {
"website": "highcharts.com/products/highstock", "website": "highcharts.com/products/highstock",
"cats": [ 25 ], "cats": [ 25 ],
"script": "highstock(\\-|\\.)?([\\d\\.]*\\d).*\\.js\\;version:\\2" "script": "highstock(?:\\-|\\.)?([\\d\\.]*\\d).*\\.js\\;version:\\1"
}, },
"Hogan.js": { "Hogan.js": {
"website": "twitter.github.com/hogan.js", "website": "twitter.github.com/hogan.js",
@ -1343,7 +1343,7 @@
"Jetty": { "Jetty": {
"website": "www.eclipse.org/jetty", "website": "www.eclipse.org/jetty",
"cats": [ 22 ], "cats": [ 22 ],
"headers": { "Server": "Jetty(\\(([\\d\\.]+\\d+))?\\;version:\\2" }, "headers": { "Server": "Jetty(?:\\(([\\d\\.]+\\d+))?\\;version:\\1" },
"implies": "Java" "implies": "Java"
}, },
"Jirafe": { "Jirafe": {
@ -1502,7 +1502,7 @@
"LabVIEW": { "LabVIEW": {
"website": "ni.com/labview", "website": "ni.com/labview",
"cats": [ 22 ], "cats": [ 22 ],
"headers": { "Server": "LabVIEW(/([\\d\\.]+))?\\;version:\\2" } "headers": { "Server": "LabVIEW(?:/([\\d\\.]+))?\\;version:\\1" }
}, },
"Laravel": { "Laravel": {
"website": "laravel.com", "website": "laravel.com",
@ -1525,7 +1525,7 @@
"libwww-perl-daemon": { "libwww-perl-daemon": {
"website": "search.cpan.org/~gaas/HTTP-Daemon-6.01/lib/HTTP/Daemon.pm", "website": "search.cpan.org/~gaas/HTTP-Daemon-6.01/lib/HTTP/Daemon.pm",
"cats": [ 22 ], "cats": [ 22 ],
"headers": { "Server": "libwww-perl-daemon(/([\\d\\.]+))?\\;version:\\2" }, "headers": { "Server": "libwww-perl-daemon(?:/([\\d\\.]+))?\\;version:\\1" },
"implies": "Perl" "implies": "Perl"
}, },
"Liferay": { "Liferay": {
@ -1598,7 +1598,7 @@
"Logitech Media Server": { "Logitech Media Server": {
"website": "www.mysqueezebox.com", "website": "www.mysqueezebox.com",
"cats": [ 22, 38 ], "cats": [ 22, 38 ],
"headers": { "Server": "Logitech Media Server( \\(([\\d\\.]+))?\\;version:\\2" } "headers": { "Server": "Logitech Media Server(?: \\(([\\d\\.]+))?\\;version:\\1" }
}, },
"Lotus Domino": { "Lotus Domino": {
"website": "www-01.ibm.com/software/lotus/products/domino", "website": "www-01.ibm.com/software/lotus/products/domino",
@ -1745,7 +1745,7 @@
"mod_auth_pam": { "mod_auth_pam": {
"website": "pam.sourceforge.net/mod_auth_pam", "website": "pam.sourceforge.net/mod_auth_pam",
"cats": [ 33 ], "cats": [ 33 ],
"headers": { "Server": "mod_auth_pam(/([\\d\\.]+))?\\;version:\\2" }, "headers": { "Server": "mod_auth_pam(?:/([\\d\\.]+))?\\;version:\\1" },
"implies": "Apache" "implies": "Apache"
}, },
"mod_fastcgi": { "mod_fastcgi": {
@ -1757,13 +1757,13 @@
"mod_jk": { "mod_jk": {
"website": "tomcat.apache.org/tomcat-3.3-doc/mod_jk-howto.html", "website": "tomcat.apache.org/tomcat-3.3-doc/mod_jk-howto.html",
"cats": [ 33 ], "cats": [ 33 ],
"headers": { "Server": "mod_jk(/([\\d\\.]+))?\\;version:\\2" }, "headers": { "Server": "mod_jk(?:/([\\d\\.]+))?\\;version:\\1" },
"implies": [ "Apache Tomcat", "Apache" ] "implies": [ "Apache Tomcat", "Apache" ]
}, },
"mod_perl": { "mod_perl": {
"website": "perl.apache.org", "website": "perl.apache.org",
"cats": [ 33 ], "cats": [ 33 ],
"headers": { "Server": "mod_perl(/([\\d\\.]+))?\\;version:\\2" }, "headers": { "Server": "mod_perl(?:/([\\d\\.]+))?\\;version:\\1" },
"implies": [ "Perl", "Apache" ] "implies": [ "Perl", "Apache" ]
}, },
"mod_python": { "mod_python": {
@ -2649,7 +2649,7 @@
"website": "splunk.com", "website": "splunk.com",
"cats": [ 19 ], "cats": [ 19 ],
"meta": { "author": "Splunk Inc\\;confidence:50" }, "meta": { "author": "Splunk Inc\\;confidence:50" },
"html": "<p class=\"footer\">&copy; [-0-9]+ Splunk Inc.( Splunk ([\\d\\.]+( build [\\d\\.]*\\d)?))?[^<]*</p>\\;version:\\2" "html": "<p class=\"footer\">&copy; [-0-9]+ Splunk Inc.(?: Splunk ([\\d\\.]+( build [\\d\\.]*\\d)?))?[^<]*</p>\\;version:\\1"
}, },
"Splunkd": { "Splunkd": {
"website": "splunk.com", "website": "splunk.com",