Merge branch 'master' of github.com:ElbertF/Wappalyzer

README.md

@@ -178,14 +178,14 @@ Work in progress, experimental. See https://wiki.mozilla.org/Jetpack.
 
 ### Python
 
-A Python port by [SebastianLopienski](https://github.com/SebastianLopienski).
+A Python port by [SebastianLopienski](https://github.com/SebastianLopienski). Part of a research project at [CERN](http://cern.ch).
 
 https://github.com/SebastianLopienski/WAD
 
 
 ### Python
 
-A Python driver by [@ebradbury](https://github.com/ebradbury). Part of a research project at [CERN](http://cern.ch).
+A Python driver by [@ebradbury](https://github.com/ebradbury). 
 
 https://github.com/ebradbury/Wappalyzer/tree/master/drivers/python
 

share/apps.json

@@ -120,7 +120,7 @@
 		},
 		"Apache": {
 			"cats": [ 22 ],
-			"headers": { "Server": "(Apache($|/([\\d\\.]+)|[^/-])|HTTPD)\\;version:\\3" }
+			"headers": { "Server": "(Apache($|/([\\d\\.]+)|[^/-])|(^|\\b)HTTPD)\\;version:\\3" }
 		},
 		"Apache JSPWiki": {
 			"cats": [ 8 ],
@@ -553,6 +553,10 @@
 			"cats": [ 31 ],
 			"headers": { "Server": "^ECS " }
 		},
+		"Embedthis-http": {
+			"cats": [ 22 ],
+			"headers": { "Server": "Embedthis-http" }
+		},
 		"EPiServer": {
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
@@ -658,6 +662,10 @@
 			"meta": { "generator": "GetSimple" },
 			"implies": [ "PHP" ]
 		},
+		"GoAhead": {
+			"cats": [ 22 ],
+			"headers": { "Server": "GoAhead" }
+		},
 		"Google Analytics": {
 			"cats": [ 10 ],
 			"html": "_gaq\\.push\\(\\['_setAccount",
@@ -869,7 +877,7 @@
 		},
 		"jQuery": {
 			"cats": [ 12 ],
-			"scripts": [ "jquery(\\-|\\.)([\\d\\.]*\\d)[^/]*\\.js\\;version:\\2", "([\\d\\.]+)/jquery(\\.min)?\\.js\\;version:\\1", "jquery.*\\.js" ], 			
+			"script": [ "jquery(\\-|\\.)([\\d\\.]*\\d)[^/]*\\.js\\;version:\\2", "([\\d\\.]+)/jquery(\\.min)?\\.js\\;version:\\1", "jquery.*\\.js" ],
 			"env": "^jQuery$"
 		},
 		"jQuery Mobile": {
@@ -964,7 +972,7 @@
 		},
 		"lighttpd": {
 			"cats": [ 22 ],
-			"headers": { "Server": "lighttpd" }
+			"headers": { "Server": "lighttpd(/([\\d\\.]+))?\\;version:\\2" }
 		},
 		"LimeSurvey": {
 			"cats": [ 19 ],
@@ -979,6 +987,11 @@
 			"script": "addtoany\\.com/menu/page\\.js",
 			"env": "^a2apage_init$"
 		},
+    "Locomotive": {
+      "cats": [ 1 ],
+      "html": "\/sites\/[a-zA-Z0-9]{24}\/theme\/stylesheets\/",
+      "implies": [ "Ruby", "Ruby on Rails" ]
+    },
 		"Lotus Domino": {
 			"cats": [ 22 ],
 			"headers": { "Server": "Lotus-Domino" }