Changeset 267675 in webkit

Timestamp:

Sep 27, 2020, 1:00:20 PM (6 years ago)

Author:

Alan Coon

Message:

Cherry-pick r267148. rdar://problem/69594002

[macOS] Limit reported macOS release to 10.15 series
​https://bugs.webkit.org/show_bug.cgi?id=216593
<rdar://problem/68937905>

Reviewed by Maciej Stachowiak.

If the reported system OS is 11.0 (or beyond) report the last stable release
of macOS.

• platform/mac/UserAgentMac.mm: (WebCore::standardUserAgentWithApplicationName):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@267148 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-610-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mac/UserAgentMac.mm (modified) (1 diff)

branches/safari-610-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-27  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r267148. rdar://problem/69594002
+
+    [macOS] Limit reported macOS release to 10.15 series
+    https://bugs.webkit.org/show_bug.cgi?id=216593
+    <rdar://problem/68937905>
+    
+    Reviewed by Maciej Stachowiak.
+    
+    If the reported system OS is 11.0 (or beyond) report the last stable release
+    of macOS.
+    
+    * platform/mac/UserAgentMac.mm:
+    (WebCore::standardUserAgentWithApplicationName):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@267148 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-09-16  Brent Fulgham  <bfulgham@apple.com>
+
+            [macOS] Limit reported macOS release to 10.15 series
+            https://bugs.webkit.org/show_bug.cgi?id=216593
+            <rdar://problem/68937905>
+
+            Reviewed by Maciej Stachowiak.
+
+            If the reported system OS is 11.0 (or beyond) report the last stable release
+            of macOS.
+
+            * platform/mac/UserAgentMac.mm:
+            (WebCore::standardUserAgentWithApplicationName):
+
 2020-09-27  Alan Coon  <alancoon@apple.com>
 

branches/safari-610-branch/Source/WebCore/platform/mac/UserAgentMac.mm

@@ -36 +36 @@
 {
     String osVersion = systemMarketingVersionForUserAgentString();
+    if (!osVersion.startsWith("10"))
+        osVersion = "10_15_6"_s;
+    
     String appNameSuffix = applicationName.isEmpty() ? "" : makeString(" ", applicationName);