From: lpsolit%gmail.com <>
Date: Sun, 5 Apr 2009 22:02:06 +0000 (+0000)
Subject: Bug 471522: OS sniffing doesn't properly detect OS X 10.5 (and others) - Patch by... 
X-Git-Tag: bugzilla-3.4rc1~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e134a893af16435c33c24a69caf42b22993b6a54;p=thirdparty%2Fbugzilla.git

Bug 471522: OS sniffing doesn't properly detect OS X 10.5 (and others) - Patch by timeless <timeless@bemail.org>, updated by Matt Selsky <selsky@columbia.edu> r=timeless a=LpSolit
---

diff --git a/enter_bug.cgi b/enter_bug.cgi
index f028187fd8..408336121d 100755
--- a/enter_bug.cgi
+++ b/enter_bug.cgi
@@ -303,8 +303,18 @@ sub pickos {
               /\(.*Windows.*NT.*\)/ && do {push @os, "Windows NT";};
             };
             /\(.*Mac OS X.*\)/ && do {
-              /\(.*Intel.*Mac OS X 10.5.*\)/ && do {push @os, "Mac OS X 10.5";};
+              /\(.*Mac OS X (?:|Mach-O |\()10.6.*\)/ && do {push @os, "Mac OS X 10.6";};
+              /\(.*Mac OS X (?:|Mach-O |\()10.5.*\)/ && do {push @os, "Mac OS X 10.5";};
+              /\(.*Mac OS X (?:|Mach-O |\()10.4.*\)/ && do {push @os, "Mac OS X 10.4";};
+              /\(.*Mac OS X (?:|Mach-O |\()10.3.*\)/ && do {push @os, "Mac OS X 10.3";};
+              /\(.*Mac OS X (?:|Mach-O |\()10.2.*\)/ && do {push @os, "Mac OS X 10.2";};
+              /\(.*Mac OS X (?:|Mach-O |\()10.1.*\)/ && do {push @os, "Mac OS X 10.1";};
+        # Unfortunately, OS X 10.4 was the first to support Intel. This is
+        # fallback support because some browsers refused to include the OS
+        # Version.
               /\(.*Intel.*Mac OS X.*\)/ && do {push @os, "Mac OS X 10.4";};
+        # OS X 10.3 is the most likely default version of PowerPC Macs
+        # OS X 10.0 is more for configurations which didn't setup 10.x versions
               /\(.*Mac OS X.*\)/ && do {push @os, ("Mac OS X 10.3", "Mac OS X 10.0", "Mac OS X");};
             };
             /\(.*32bit.*\)/ && do {push @os, "Windows 95";};