Title: [237528] branches/safari-606-branch/Source
- Revision
- 237528
- Author
- [email protected]
- Date
- 2018-10-28 12:38:56 -0700 (Sun, 28 Oct 2018)
Log Message
Apply patch. rdar://problem/45523764
Modified Paths
Diff
Modified: branches/safari-606-branch/Source/WebCore/PAL/ChangeLog (237527 => 237528)
--- branches/safari-606-branch/Source/WebCore/PAL/ChangeLog 2018-10-28 19:12:27 UTC (rev 237527)
+++ branches/safari-606-branch/Source/WebCore/PAL/ChangeLog 2018-10-28 19:38:56 UTC (rev 237528)
@@ -1,3 +1,18 @@
+2018-10-28 Babak Shafiei <[email protected]>
+
+ Apply patch. rdar://problem/45523764
+
+ 2018-10-28 John Wilander <[email protected]>
+
+ Override the session configuration for cookieAcceptPolicy
+ https://bugs.webkit.org/show_bug.cgi?id=190925
+ <rdar://problem/45497382>
+
+ Reviewed by Alex Christensen.
+
+ * pal/spi/cf/CFNetworkSPI.h:
+ Added the _overrideSessionCookieAcceptPolicy property.
+
2018-09-06 Babak Shafiei <[email protected]>
Cherry-pick r235349. rdar://problem/44209834
Modified: branches/safari-606-branch/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (237527 => 237528)
--- branches/safari-606-branch/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2018-10-28 19:12:27 UTC (rev 237527)
+++ branches/safari-606-branch/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2018-10-28 19:38:56 UTC (rev 237528)
@@ -165,6 +165,7 @@
- (void)_getCookiesForURL:(NSURL *)url mainDocumentURL:(NSURL *)mainDocumentURL partition:(NSString *)partition completionHandler:(void (^)(NSArray *))completionHandler;
- (void)_getCookiesForURL:(NSURL *)url mainDocumentURL:(NSURL *)mainDocumentURL partition:(NSString *)partition policyProperties:(NSDictionary*)props completionHandler:(void (^)(NSArray *))completionHandler;
- (void)_setCookies:(NSArray *)cookies forURL:(NSURL *)URL mainDocumentURL:(NSURL *)mainDocumentURL policyProperties:(NSDictionary*) props;
+@property (nonatomic, readwrite) BOOL _overrideSessionCookieAcceptPolicy;
@end
@interface NSURLSessionTask ()
Modified: branches/safari-606-branch/Source/WebKit/ChangeLog (237527 => 237528)
--- branches/safari-606-branch/Source/WebKit/ChangeLog 2018-10-28 19:12:27 UTC (rev 237527)
+++ branches/safari-606-branch/Source/WebKit/ChangeLog 2018-10-28 19:38:56 UTC (rev 237528)
@@ -1,5 +1,22 @@
2018-10-28 Babak Shafiei <[email protected]>
+ Apply patch. rdar://problem/45523764
+
+ 2018-10-28 John Wilander <[email protected]>
+
+ Override the session configuration for cookieAcceptPolicy
+ https://bugs.webkit.org/show_bug.cgi?id=190925
+ <rdar://problem/45497382>
+
+ Reviewed by Alex Christensen.
+
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
+ Sets the _overrideSessionCookieAcceptPolicy property to YES
+ If the application is Safari.
+
+2018-10-28 Babak Shafiei <[email protected]>
+
Cherry-pick r237135. rdar://problem/45562440
[iOS] Can't select text after dismissing the keyboard when changing focus
Modified: branches/safari-606-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (237527 => 237528)
--- branches/safari-606-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2018-10-28 19:12:27 UTC (rev 237527)
+++ branches/safari-606-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2018-10-28 19:38:56 UTC (rev 237528)
@@ -44,6 +44,7 @@
#import <WebCore/ResourceError.h>
#import <WebCore/ResourceRequest.h>
#import <WebCore/ResourceResponse.h>
+#import <WebCore/RuntimeApplicationChecks.h>
#import <WebCore/SharedBuffer.h>
#import <WebCore/URL.h>
#import <WebCore/WebCoreURLResponse.h>
@@ -713,9 +714,23 @@
auto* storageSession = WebCore::NetworkStorageSession::storageSession(parameters.sessionID);
RELEASE_ASSERT(storageSession);
+
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300) || PLATFORM(IOS)
if (CFHTTPCookieStorageRef storage = storageSession->cookieStorage().get())
configuration.HTTPCookieStorage = [[[NSHTTPCookieStorage alloc] _initWithCFHTTPCookieStorage:storage] autorelease];
+#else
+ NSHTTPCookieStorage* cookieStorage;
+ if (CFHTTPCookieStorageRef storage = storageSession->cookieStorage().get()) {
+ cookieStorage = [[[NSHTTPCookieStorage alloc] _initWithCFHTTPCookieStorage:storage] autorelease];
+ configuration.HTTPCookieStorage = cookieStorage;
+ } else
+ cookieStorage = storageSession->nsCookieStorage();
+ ASSERT(cookieStorage);
+ if (WebCore::MacApplication::isSafari() && [cookieStorage respondsToSelector:@selector(_overrideSessionCookieAcceptPolicy)])
+ cookieStorage._overrideSessionCookieAcceptPolicy = YES;
+#endif
+
m_sessionWithCredentialStorageDelegate = adoptNS([[WKNetworkSessionDelegate alloc] initWithNetworkSession:*this withCredentials:true]);
m_sessionWithCredentialStorage = [NSURLSession sessionWithConfiguration:configuration delegate:static_cast<id>(m_sessionWithCredentialStorageDelegate.get()) delegateQueue:[NSOperationQueue mainQueue]];
LOG(NetworkSession, "Created NetworkSession with cookieAcceptPolicy %lu", configuration.HTTPCookieStorage.cookieAcceptPolicy);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
