Title: [267675] branches/safari-610-branch/Source/WebCore
Revision
267675
Author
[email protected]
Date
2020-09-27 13:00:20 -0700 (Sun, 27 Sep 2020)

Log 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

Modified Paths

Diff

Modified: branches/safari-610-branch/Source/WebCore/ChangeLog (267674 => 267675)


--- branches/safari-610-branch/Source/WebCore/ChangeLog	2020-09-27 20:00:18 UTC (rev 267674)
+++ branches/safari-610-branch/Source/WebCore/ChangeLog	2020-09-27 20:00:20 UTC (rev 267675)
@@ -1,5 +1,38 @@
 2020-09-27  Alan Coon  <[email protected]>
 
+        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  <[email protected]>
+
+            [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  <[email protected]>
+
         Cherry-pick r267002. rdar://problem/69594199
 
     Overflow:scroll rubberbanding is interrupted by post-layout scrolling

Modified: branches/safari-610-branch/Source/WebCore/platform/mac/UserAgentMac.mm (267674 => 267675)


--- branches/safari-610-branch/Source/WebCore/platform/mac/UserAgentMac.mm	2020-09-27 20:00:18 UTC (rev 267674)
+++ branches/safari-610-branch/Source/WebCore/platform/mac/UserAgentMac.mm	2020-09-27 20:00:20 UTC (rev 267675)
@@ -35,6 +35,9 @@
 String standardUserAgentWithApplicationName(const String& applicationName, const String&, UserAgentType)
 {
     String osVersion = systemMarketingVersionForUserAgentString();
+    if (!osVersion.startsWith("10"))
+        osVersion = "10_15_6"_s;
+    
     String appNameSuffix = applicationName.isEmpty() ? "" : makeString(" ", applicationName);
 
     return makeString("Mozilla/5.0 (Macintosh; Intel Mac OS X ", osVersion, ") AppleWebKit/605.1.15 (KHTML, like Gecko)", appNameSuffix);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to