Title: [214576] branches/safari-604.1.14-branch/Source
Revision
214576
Author
jmarc...@apple.com
Date
2017-03-29 16:41:50 -0700 (Wed, 29 Mar 2017)

Log Message

Cherry-pick r214404. rdar://problem/31095987

Modified Paths

Diff

Modified: branches/safari-604.1.14-branch/Source/_javascript_Core/ChangeLog (214575 => 214576)


--- branches/safari-604.1.14-branch/Source/_javascript_Core/ChangeLog	2017-03-29 23:41:47 UTC (rev 214575)
+++ branches/safari-604.1.14-branch/Source/_javascript_Core/ChangeLog	2017-03-29 23:41:50 UTC (rev 214576)
@@ -1,17 +1,21 @@
-2017-03-24  Mark Lam  <mark....@apple.com>
+2017-03-29  Jason Marcell  <jmarc...@apple.com>
 
-        Add some instrumentation in Heap::resumeThePeriphery() to help debug an issue.
-        https://bugs.webkit.org/show_bug.cgi?id=170086
-        <rdar://problem/31253673>
+        Cherry-pick r214404. rdar://problem/31095987
 
-        Reviewed by Saam Barati.
+    2017-03-24  Mark Lam  <mark....@apple.com>
 
-        Adding some instrumentation in Heap::resumeThePeriphery() to dump some Heap state
-        just before we RELEASE_ASSERT_NOT_REACHED.
+            Add some instrumentation in Heap::resumeThePeriphery() to help debug an issue.
+            https://bugs.webkit.org/show_bug.cgi?id=170086
+            <rdar://problem/31253673>
 
-        * heap/Heap.cpp:
-        (JSC::Heap::resumeThePeriphery):
+            Reviewed by Saam Barati.
 
+            Adding some instrumentation in Heap::resumeThePeriphery() to dump some Heap state
+            just before we RELEASE_ASSERT_NOT_REACHED.
+
+            * heap/Heap.cpp:
+            (JSC::Heap::resumeThePeriphery):
+
 2017-03-22  Mark Lam  <mark....@apple.com>
 
         Add support for Error.stackTraceLimit.

Modified: branches/safari-604.1.14-branch/Source/WebKit2/ChangeLog (214575 => 214576)


--- branches/safari-604.1.14-branch/Source/WebKit2/ChangeLog	2017-03-29 23:41:47 UTC (rev 214575)
+++ branches/safari-604.1.14-branch/Source/WebKit2/ChangeLog	2017-03-29 23:41:50 UTC (rev 214576)
@@ -1,5 +1,28 @@
 2017-03-29  Jason Marcell  <jmarc...@apple.com>
 
+        Cherry-pick r214404. rdar://problem/31095987
+
+    2017-03-25  John Wilander  <wilan...@apple.com>
+
+            Re-enable the web process' keychain access to fix client certificate authentication
+            https://bugs.webkit.org/show_bug.cgi?id=170074
+            <rdar://problem/31095987>
+
+            Reviewed by Brent Fulgham.
+
+            This is a follow-up patch to
+            https://trac.webkit.org/changeset/214389/webkit
+            since according to Alexey Proskuryakov, resource
+            loading has always required identical sandbox
+            rules in WebContent and Networking processes.
+
+            * WebProcess/com.apple.WebProcess.sb.in:
+                Reverted remaining change from
+                https://trac.webkit.org/changeset/208702/webkit and
+                https://trac.webkit.org/changeset/208707/webkit.
+
+2017-03-29  Jason Marcell  <jmarc...@apple.com>
+
         Cherry-pick r214393. rdar://problem/31253673
 
     2017-03-29  Jason Marcell  <jmarc...@apple.com>

Modified: branches/safari-604.1.14-branch/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in (214575 => 214576)


--- branches/safari-604.1.14-branch/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in	2017-03-29 23:41:47 UTC (rev 214575)
+++ branches/safari-604.1.14-branch/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in	2017-03-29 23:41:50 UTC (rev 214576)
@@ -336,7 +336,6 @@
        (global-name "com.apple.CoreAuthentication.agent.libxpc")
        (global-name "com.apple.SecurityServer"))
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101240
 ;; FIXME: This should be removed when <rdar://problem/10479685> is fixed.
 ;; Restrict AppSandboxed processes from creating /Library/Keychains, but allow access to the contents of /Library/Keychains:
 (allow file-read-data file-read-metadata file-write-data
@@ -350,7 +349,6 @@
 (deny file-read* file-write*
     (regex (string-append "/Library/Keychains/" (uuid-regex-string) "(/|$)"))
     (home-regex (string-append "/Library/Keychains/" (uuid-regex-string) "(/|$)")))
-#endif
 
 (allow file-read* file-write* (subpath "/private/var/db/mds/system")) ;; FIXME: This should be removed when <rdar://problem/9538414> is fixed.
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to