From 4830ce85519b49c3268750a9e19e45dab3eab216 Mon Sep 17 00:00:00 2001
From: SebastianLopienski <Sebastian.Lopienski@cern.ch>
Date: Fri, 25 Jan 2013 16:55:19 +0100
Subject: [PATCH 1/3] Added two web servers + one fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added two web servers: 
* GoAhead Web Server (http://embedthis.com/products/goahead/index.html)
* Embedthis-http (https://github.com/embedthis/http)
Icons will follow.

Additionally, used word boundary for Apache, as suggested by @ElbertF in #217.
---
 share/apps.json | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/share/apps.json b/share/apps.json
index 906598965..d8f7ac9a8 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -117,7 +117,7 @@
 		},
 		"Apache": {
 			"cats": [ 22 ],
-			"headers": { "Server": "(Apache($|/([\\d\\.]+)|[^/-])|(^|[^g])HTTPD)\\;version:\\3" }
+			"headers": { "Server": "(Apache($|/([\\d\\.]+)|[^/-])|(^|\\b)HTTPD)\\;version:\\3" }
 		},
 		"Apache JSPWiki": {
 			"cats": [ 8 ],
@@ -550,6 +550,10 @@
 			"cats": [ 31 ],
 			"headers": { "Server": "^ECS " }
 		},
+		"Embedthis-http": {
+			"cats": [ 22 ],
+			"headers": { "Server": "Embedthis-http" }
+		},				
 		"EPiServer": {
 			"cats": [ 1 ],
 			"meta": { "generator": "EPiServer" },
@@ -655,6 +659,10 @@
 			"meta": { "generator": "GetSimple" },
 			"implies": [ "PHP" ]
 		},
+		"GoAhead Web Server": {
+			"cats": [ 22 ],
+			"headers": { "Server": "GoAhead" }
+		},				
 		"Google Analytics": {
 			"cats": [ 10 ],
 			"html": "_gaq\\.push\\(\\['_setAccount",

From eb8331e251c3c54df28487c9e3c84f5d035b0d9f Mon Sep 17 00:00:00 2001
From: Sebastian Lopienski <Sebastian.Lopienski@cern.ch>
Date: Fri, 25 Jan 2013 17:03:27 +0100
Subject: [PATCH 2/3] GoAhead Web Server -> GoAhead

---
 share/apps.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/apps.json b/share/apps.json
index d8f7ac9a8..52a94fcb9 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -659,7 +659,7 @@
 			"meta": { "generator": "GetSimple" },
 			"implies": [ "PHP" ]
 		},
-		"GoAhead Web Server": {
+		"GoAhead": {
 			"cats": [ 22 ],
 			"headers": { "Server": "GoAhead" }
 		},				

From 000a0e6eb110350d4bebaecd2b6a463ddf0f6ea8 Mon Sep 17 00:00:00 2001
From: Sebastian Lopienski <Sebastian.Lopienski@cern.ch>
Date: Fri, 25 Jan 2013 17:06:55 +0100
Subject: [PATCH 3/3] Icons for the new apps

---
 share/images/icons/Embedthis-http.png | Bin 0 -> 442 bytes
 share/images/icons/GoAhead.png        | Bin 0 -> 442 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 share/images/icons/Embedthis-http.png
 create mode 100644 share/images/icons/GoAhead.png

diff --git a/share/images/icons/Embedthis-http.png b/share/images/icons/Embedthis-http.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d67489eb5802628a034140dac33c8151749377e
GIT binary patch
literal 442
zcmV;r0Y(0aP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004jNkl<ZILn=r
z%TH5L5QqEMiUCU?J{J4|Cd9o<H!h8FPlzVcLJNm#L}*JNxA#$QF5cI<uXEa(ek_be
zQf^zF<vhNb%x|W`e^@9b^Z6Wr%D)swGNIP((Y5S9zO?{aYc8EJ4L{`5_26D?C1B{?
z^4YZbI{C>*`vyOb*8{jgz=>&b9K;+4F(Ollp|Oy+0Em)=mNn+kbU2kcho(c_k2vV|
zQCgP+GNt+ExEvT39pEf2I0+?9nIUpbZ|pueX$8RZed?VaN2X1EWN|b!s0|J3#)xy*
zMHr*f9aR8kvsr1vZ@rb)<VukjioDRodWtWz<tn^u2fVmU*lncjHdA&Q3DsuKMl<H+
zxyP50TMn?pl*d9*y@t&Tc+!EVH?Y|%ct4ON#bmjR`yya_0FMN0_hF-@dDD*YWWM?i
zPVI=THdMR6I={MzX?wDKiGSN<I^~&2d43CfElJG^mtN`u;O$kw*7t%B{g6Vbm49*%
kVEu@BEo_`9Tl+)r0RQmO;64({KL7v#07*qoM6N<$f>mS7hX4Qo

literal 0
HcmV?d00001

diff --git a/share/images/icons/GoAhead.png b/share/images/icons/GoAhead.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d67489eb5802628a034140dac33c8151749377e
GIT binary patch
literal 442
zcmV;r0Y(0aP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004jNkl<ZILn=r
z%TH5L5QqEMiUCU?J{J4|Cd9o<H!h8FPlzVcLJNm#L}*JNxA#$QF5cI<uXEa(ek_be
zQf^zF<vhNb%x|W`e^@9b^Z6Wr%D)swGNIP((Y5S9zO?{aYc8EJ4L{`5_26D?C1B{?
z^4YZbI{C>*`vyOb*8{jgz=>&b9K;+4F(Ollp|Oy+0Em)=mNn+kbU2kcho(c_k2vV|
zQCgP+GNt+ExEvT39pEf2I0+?9nIUpbZ|pueX$8RZed?VaN2X1EWN|b!s0|J3#)xy*
zMHr*f9aR8kvsr1vZ@rb)<VukjioDRodWtWz<tn^u2fVmU*lncjHdA&Q3DsuKMl<H+
zxyP50TMn?pl*d9*y@t&Tc+!EVH?Y|%ct4ON#bmjR`yya_0FMN0_hF-@dDD*YWWM?i
zPVI=THdMR6I={MzX?wDKiGSN<I^~&2d43CfElJG^mtN`u;O$kw*7t%B{g6Vbm49*%
kVEu@BEo_`9Tl+)r0RQmO;64({KL7v#07*qoM6N<$f>mS7hX4Qo

literal 0
HcmV?d00001