Changeset 28499 in webkit

Timestamp:

Dec 6, 2007 2:36:10 PM (16 years ago)

Author:

Darin Adler

Message:

Reviewed by Tim Hatcher.

• fix <rdar://problem/5513394> No way to detect Tiger vs Leopard from Safari's user agent string

• WebView/WebView.mm: (callGestalt): Added. (createMacOSXVersionString): Added. (-[WebView _userAgentWithApplicationName:andWebKitVersion:]): Added Mac OS X version string, right after the string "Mac OS X", but with underscores instead of dots to avoid the dreaded "4." problem (old libraries that think a "4." anywhere in the user agent means Netscape 4). (-[WebView _userAgentForURL:]): Fixed incorrect bug numbers.

Location:

trunk/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebView.mm (modified) (3 diffs)

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2007-12-06  Darin Adler  <darin@apple.com>
+
+        Reviewed by Tim Hatcher.
+
+        - fix <rdar://problem/5513394> No way to detect Tiger vs Leopard from Safari's user agent string
+
+        * WebView/WebView.mm:
+        (callGestalt): Added.
+        (createMacOSXVersionString): Added.
+        (-[WebView _userAgentWithApplicationName:andWebKitVersion:]): Added Mac OS X version string,
+        right after the string "Mac OS X", but with underscores instead of dots to avoid the dreaded
+        "4." problem (old libraries that think a "4." anywhere in the user agent means Netscape 4).
+        (-[WebView _userAgentForURL:]): Fixed incorrect bug numbers.
+
 2007-12-04  Geoffrey Garen  <ggaren@apple.com>
 

trunk/WebKit/mac/WebView/WebView.mm

@@ -4061 +4061 @@
 }
 
+static inline int callGestalt(OSType selector)
+{
+    SInt32 value = 0;
+    Gestalt(selector, &value);
+    ASSERT(value);
+    return value;
+}
+
+// Uses underscores instead of dots because if "4." ever appears in a user agent string, old DHTML libraries treat it as Netscape 4.
+static NSString *createMacOSXVersionString()
+{
+    // Can't use -[NSProcessInfo operatingSystemVersionString] because it has too much stuff we don't want.
+    int major = callGestalt(gestaltSystemVersionMajor);
+    int minor = callGestalt(gestaltSystemVersionMinor);
+    int bugFix = callGestalt(gestaltSystemVersionBugFix);
+    if (bugFix)
+        return [[NSString alloc] initWithFormat:@"%d_%d_%d", major, minor, bugFix];
+    if (minor)
+        return [[NSString alloc] initWithFormat:@"%d_%d", major, minor];
+    return [[NSString alloc] initWithFormat:@"%d", major];
+}
+
 - (NSString *)_userAgentWithApplicationName:(NSString *)applicationName andWebKitVersion:(NSString *)version
 {
+    static NSString *osVersion = createMacOSXVersionString();
     NSString *language = [NSUserDefaults _webkit_preferredLanguageCode];
     if ([applicationName length])
-        return [NSString stringWithFormat:@"Mozilla/5.0 (Macintosh; U; " PROCESSOR " Mac OS X; %@) AppleWebKit/%@ (KHTML, like Gecko) %@", language, version, applicationName];
-    return [NSString stringWithFormat:@"Mozilla/5.0 (Macintosh; U; " PROCESSOR " Mac OS X; %@) AppleWebKit/%@ (KHTML, like Gecko)", language, version];
+        return [NSString stringWithFormat:@"Mozilla/5.0 (Macintosh; U; " PROCESSOR " Mac OS X %@; %@) AppleWebKit/%@ (KHTML, like Gecko) %@",
+            osVersion, language, version, applicationName];
+    return [NSString stringWithFormat:@"Mozilla/5.0 (Macintosh; U; " PROCESSOR " Mac OS X %@; %@) AppleWebKit/%@ (KHTML, like Gecko)",
+        osVersion, language, version];
 }
 
@@ -4073 +4098 @@
 {
     if (_private->useSiteSpecificSpoofing) {
-        // FIXME: Make this a hash table lookup if more domains need spoofing.
-        // FIXME: Remove yahoo.com once <rdar://problem/5057117> is fixed.
+        // FIXME: Remove yahoo.com once <rdar://problem/4549681> is fixed.
         if (url.host().endsWith("yahoo.com")) {
             static String yahooUserAgent([self _userAgentWithApplicationName:_private->applicationNameForUserAgent andWebKitVersion:@"422"]);
@@ -4080 +4104 @@
         }
         
-        // FIXME: Remove flickr.com workaround once <rdar://problem/5084872> is fixed
+        // FIXME: Remove flickr.com workaround once <rdar://problem/5081617> is fixed
         if (url.host().endsWith("flickr.com")) {
             // Safari 2.0.4's user agent string works here