Title: [212668] branches/safari-603-branch/Source/WebKit2
- Revision
- 212668
- Author
- matthew_han...@apple.com
- Date
- 2017-02-20 13:10:57 -0800 (Mon, 20 Feb 2017)
Log Message
Merge r212666. rdar://problem/30239618
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (212667 => 212668)
--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-02-20 20:57:58 UTC (rev 212667)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-02-20 21:10:57 UTC (rev 212668)
@@ -1,5 +1,23 @@
2017-02-20 Matthew Hanson <matthew_han...@apple.com>
+ Merge r212666. rdar://problem/30239618
+
+ 2017-02-20 David Quesada <david_ques...@apple.com>
+
+ Don’t set NSURLSessionConfiguration’s _sourceApplicationAuditTokenData if _sourceApplicationBundleIdentifier is also set.
+ https://bugs.webkit.org/show_bug.cgi?id=168607
+
+ rdar://problem/30239618
+
+ Reviewed by Geoffrey Garen.
+
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
+ If the process pool configuration sets a source application bundle identifier, don't give the NSURLSession configuration
+ the audit token from the UI process, as it may be associated with an application with a conflicting bundle identifier.
+
+2017-02-20 Matthew Hanson <matthew_han...@apple.com>
+
Rollout r212538. rdar://problem/30541748
2017-02-17 Matthew Hanson <matthew_han...@apple.com>
Modified: branches/safari-603-branch/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm (212667 => 212668)
--- branches/safari-603-branch/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2017-02-20 20:57:58 UTC (rev 212667)
+++ branches/safari-603-branch/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2017-02-20 21:10:57 UTC (rev 212668)
@@ -470,8 +470,10 @@
configuration._sourceApplicationAuditTokenData = (NSData *)data.get();
auto& sourceApplicationBundleIdentifier = globalSourceApplicationBundleIdentifier();
- if (!sourceApplicationBundleIdentifier.isEmpty())
+ if (!sourceApplicationBundleIdentifier.isEmpty()) {
configuration._sourceApplicationBundleIdentifier = sourceApplicationBundleIdentifier;
+ configuration._sourceApplicationAuditTokenData = nil;
+ }
auto& sourceApplicationSecondaryIdentifier = globalSourceApplicationSecondaryIdentifier();
if (!sourceApplicationSecondaryIdentifier.isEmpty())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
