Title: [230309] branches/safari-605-branch/Source/WebCore
- Revision
- 230309
- Author
- jmarc...@apple.com
- Date
- 2018-04-05 11:50:26 -0700 (Thu, 05 Apr 2018)
Log Message
Cherry-pick r228334. rdar://problem/38712636
Modified Paths
Diff
Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (230308 => 230309)
--- branches/safari-605-branch/Source/WebCore/ChangeLog 2018-04-05 18:07:28 UTC (rev 230308)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog 2018-04-05 18:50:26 UTC (rev 230309)
@@ -1,5 +1,23 @@
2018-04-05 Jason Marcell <jmarc...@apple.com>
+ Cherry-pick r228334. rdar://problem/38712636
+
+ 2018-02-09 Brent Fulgham <bfulg...@apple.com>
+
+ [macOS, iOS] Expose OS marketing version in UserAgent
+ https://bugs.webkit.org/show_bug.cgi?id=182629
+ <rdar://problem/37370975>
+
+ Reviewed by Daniel Bates.
+
+ Revert back to dynamically reading the operating system marketing version
+ rather than using a hard-coded version.
+
+ * page/cocoa/UserAgent.mm:
+ (WebCore::systemMarketingVersionForUserAgentString):
+
+2018-04-05 Jason Marcell <jmarc...@apple.com>
+
Apply patch. rdar://problem/39191858
fix-httponly-cookie
Modified: branches/safari-605-branch/Source/WebCore/page/cocoa/UserAgent.mm (230308 => 230309)
--- branches/safari-605-branch/Source/WebCore/page/cocoa/UserAgent.mm 2018-04-05 18:07:28 UTC (rev 230308)
+++ branches/safari-605-branch/Source/WebCore/page/cocoa/UserAgent.mm 2018-04-05 18:50:26 UTC (rev 230309)
@@ -26,6 +26,8 @@
#import "config.h"
#import "UserAgent.h"
+#import "SystemVersion.h"
+
namespace WebCore {
String systemMarketingVersionForUserAgentString()
@@ -33,17 +35,7 @@
// Use underscores instead of dots because when we first added the Mac OS X version to the user agent string
// we were concerned about old DHTML libraries interpreting "4." as Netscape 4. That's no longer a concern for us
// but we're sticking with the underscores for compatibility with the format used by older versions of Safari.
-#if PLATFORM(MAC)
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
- return ASCIILiteral("10_13_4");
-#elif __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
- return ASCIILiteral("10_12_6");
-#else
- return ASCIILiteral("10_11_6");
-#endif
-#else
- return ASCIILiteral("11_3");
-#endif
+ return [systemMarketingVersion() stringByReplacingOccurrencesOfString:@"." withString:@"_"];
}
String userAgentBundleVersion()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
