From 720e235d9a1359efecd0a3c5849d81f274a0282f Mon Sep 17 00:00:00 2001
From: Bernardo Damele <bernardo.damele@gmail.com>
Date: Sun, 31 Oct 2010 18:18:49 +0000
Subject: [PATCH] Fixed Windows 2003/2008 signatures. Added more old RedHat
 Server header signatures. Added old Debian etch signature too.

---
 xml/banner/server.xml           | 35 +++++++++++++++++++++++----------
 xml/banner/x-aspnet-version.xml |  2 +-
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/xml/banner/server.xml b/xml/banner/server.xml
index 5dc9f010a..c3c9725e8 100644
--- a/xml/banner/server.xml
+++ b/xml/banner/server.xml
@@ -11,35 +11,39 @@
     <!-- Microsoft IIS -->
 
     <regexp value="Microsoft-IIS/(7\.5)">
-        <info technology="Microsoft IIS" tech_version="1"/>
+        <info technology="Microsoft IIS" tech_version="1" type="Windows" distrib="2008"/>
     </regexp>
 
     <regexp value="Microsoft-IIS/(7\.0)">
-        <info technology="Microsoft IIS" tech_version="1"/>
+        <info technology="Microsoft IIS" tech_version="1" type="Windows" distrib="Vista"/>
     </regexp>
 
     <regexp value="Microsoft-IIS/(6\.0)">
-        <info technology="Microsoft IIS" tech_version="1"/>
+        <info technology="Microsoft IIS" tech_version="1" type="Windows" distrib="2003"/>
+    </regexp>
+
+    <regexp value="Microsoft-IIS/(5\.2)">
+        <info technology="Microsoft IIS" tech_version="1" type="Windows" distrib="2003"/>
     </regexp>
 
     <regexp value="Microsoft-IIS/(5\.1)">
-        <info technology="Microsoft IIS" tech_version="1"/>
+        <info technology="Microsoft IIS" tech_version="1" type="Windows" distrib="XP"/>
     </regexp>
 
     <regexp value="Microsoft-IIS/(5\.0)">
-        <info technology="Microsoft IIS" tech_version="1"/>
+        <info technology="Microsoft IIS" tech_version="1" type="Windows" distrib="2000"/>
     </regexp>
 
     <regexp value="Microsoft-IIS/(4\.0)">
-        <info technology="Microsoft IIS" tech_version="1"/>
+        <info technology="Microsoft IIS" tech_version="1" type="Windows" distrib="NT 4.0"/>
     </regexp>
 
     <regexp value="Microsoft-IIS/(3\.0)">
-        <info technology="Microsoft IIS" tech_version="1"/>
+        <info technology="Microsoft IIS" tech_version="1" type="Windows" distrib="NT 4.0"/>
     </regexp>
 
     <regexp value="Microsoft-IIS/(2\.0)">
-        <info technology="Microsoft IIS" tech_version="1"/>
+        <info technology="Microsoft IIS" tech_version="1" type="Windows" distrib="NT 4.0"/>
     </regexp>
 
     <!-- Apache -->
@@ -108,6 +112,10 @@
         <info type="Linux" distrib="Debian" release="3.1" codename="sarge"/>
     </regexp>
 
+    <regexp value="Apache/1\.3\.34 \(Debian GNU\/Linux\)">
+        <info type="Linux" distrib="Debian" release="4.0" codename="etch"/>
+    </regexp>
+
     <regexp value="Apache/2\.2\.3 \(Debian\)">
         <info type="Linux" distrib="Debian" release="4.0" codename="etch"/>
     </regexp>
@@ -391,7 +399,14 @@
     </regexp>
 
     <!-- Apache: Red Hat -->
-    <!-- TODO: add Red Hat 5, 5.1, 5.2 and 5.3 -->
+
+    <regexp value="Apache/1\.1\.3 Red Hat">
+        <info type="Linux" distrib="Red Hat" release="4.2" codename="Biltmore"/>
+    </regexp>
+
+    <regexp value="Apache/1\.2\.4 Red Hat">
+        <info type="Linux" distrib="Red Hat" release="5.0" codename="Hurricane"/>
+    </regexp>
 
     <regexp value="Apache/1\.2\.6 Red Hat">
         <info type="Linux" distrib="Red Hat" release="5.1" codename="Manhattan"/>
@@ -410,7 +425,7 @@
     </regexp>
     
     <regexp value="Apache/1\.3\.12 \(Unix\)  \(Red Hat/Linux\)">
-        <info type="Linux" distrib="Red Hat" release="7.0" codename="Guinness"/>
+        <info type="Linux" distrib="Red Hat" release="6.2|7.0" codename="Zoot|Guinness"/>
     </regexp>
 	
     <regexp value="Apache/1\.3\.19 \(Unix\)  \(Red-Hat/Linux\)">
diff --git a/xml/banner/x-aspnet-version.xml b/xml/banner/x-aspnet-version.xml
index c3a5e28b6..5cabdc4ce 100644
--- a/xml/banner/x-aspnet-version.xml
+++ b/xml/banner/x-aspnet-version.xml
@@ -4,6 +4,6 @@
 
 <root>
     <regexp value="([\d\.]+)">
-        <info technology="ASP.NET" tech_version="1" type="Windows" distrib="2003|2008"/>
+        <info technology="ASP.NET" tech_version="1" type="Windows"/>
     </regexp>
 </root>