Title: [240439] branches/safari-607-branch/Source/WebCore/PAL
- Revision
- 240439
- Author
- [email protected]
- Date
- 2019-01-24 09:52:35 -0800 (Thu, 24 Jan 2019)
Log Message
Cherry-pick r240430. rdar://problem/47484242
Follow-up #2: Override the session configuration for cookieAcceptPolicy
<https://bugs.webkit.org/show_bug.cgi?id=190925>
<rdar://problem/45497382>
* pal/spi/cf/CFNetworkSPI.h: Protect Objective-C code using
defined(__OBJC__) macro.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240430 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-607-branch/Source/WebCore/PAL/ChangeLog (240438 => 240439)
--- branches/safari-607-branch/Source/WebCore/PAL/ChangeLog 2019-01-24 17:30:10 UTC (rev 240438)
+++ branches/safari-607-branch/Source/WebCore/PAL/ChangeLog 2019-01-24 17:52:35 UTC (rev 240439)
@@ -1,3 +1,25 @@
+2019-01-24 Kocsen Chung <[email protected]>
+
+ Cherry-pick r240430. rdar://problem/47484242
+
+ Follow-up #2: Override the session configuration for cookieAcceptPolicy
+ <https://bugs.webkit.org/show_bug.cgi?id=190925>
+ <rdar://problem/45497382>
+
+ * pal/spi/cf/CFNetworkSPI.h: Protect Objective-C code using
+ defined(__OBJC__) macro.
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240430 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-01-24 David Kilzer <[email protected]>
+
+ Follow-up #2: Override the session configuration for cookieAcceptPolicy
+ <https://bugs.webkit.org/show_bug.cgi?id=190925>
+ <rdar://problem/45497382>
+
+ * pal/spi/cf/CFNetworkSPI.h: Protect Objective-C code using
+ defined(__OBJC__) macro.
+
2019-01-23 Alan Coon <[email protected]>
Cherry-pick r240184. rdar://problem/47484242
Modified: branches/safari-607-branch/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (240438 => 240439)
--- branches/safari-607-branch/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2019-01-24 17:30:10 UTC (rev 240438)
+++ branches/safari-607-branch/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2019-01-24 17:52:35 UTC (rev 240439)
@@ -65,7 +65,7 @@
// This only needs to be declared on macOS 10.12 Sierra because
// it will never appear in those SDK headers. See also
// HAVE(CFNETWORK_OVERRIDE_SESSION_COOKIE_ACCEPT_POLICY).
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED == 101200
+#if defined(__OBJC__) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED == 101200
@interface NSHTTPCookieStorage ()
@property (nonatomic, readwrite) BOOL _overrideSessionCookieAcceptPolicy;
@end
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
