'[webkit-changes] [232341] tags/Safari-606.1.19/Source'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       webkit-changes
Subject:    [webkit-changes] [232341] tags/Safari-606.1.19/Source
From:       kocsen_chung () apple ! com
Date:       2018-05-31 7:10:48
Message-ID: 20180531071048.55D7210051CE () svn ! webkit ! org
[Download RAW message or body]

[Attachment #2 (text/html)]

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[232341] tags/Safari-606.1.19/Source</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt;  } #msg dl a { font-weight: \
bold} #msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
 #patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
                .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="http://trac.webkit.org/projects/webkit/changeset/232341">232341</a></dd> \
<dt>Author</dt> <dd>kocsen_chung@apple.com</dd> <dt>Date</dt> <dd>2018-05-31 00:10:48 \
-0700 (Thu, 31 May 2018)</dd> </dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/232312">r232312</a>. \
rdar://problem/39338957

    [Cocoa] Add an SPI to suppress connection termination errors from CFNetwork when \
network interfaces change  https://bugs.webkit.org/show_bug.cgi?id=186107
    &lt;rdar://problem/39338957&gt;

    Reviewed by Brady Eidson.

    Source/WebCore/PAL:

    * pal/spi/cf/CFNetworkSPI.h: Declared new SPI.

    Source/WebKit:

    Added an SPI which configures a process pool's networking process to set the
    kCFStreamPropertyAutoErrorOnSystemChange to NO on its NSURLSessionConfigurations.
    This instructs CFNetwork to not terminate active connections when the system's
    network interfaces change.

    * NetworkProcess/NetworkProcess.h:
    (WebKit::NetworkProcess::suppressesConnectionTerminationOnSystemChange const):
    * NetworkProcess/NetworkProcessCreationParameters.cpp:
    (WebKit::NetworkProcessCreationParameters::encode const):
    (WebKit::NetworkProcessCreationParameters::decode):
    * NetworkProcess/NetworkProcessCreationParameters.h:
    * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
    (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
    * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
    (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
    * UIProcess/API/APIProcessPoolConfiguration.cpp:
    (API::ProcessPoolConfiguration::copy):
    * UIProcess/API/APIProcessPoolConfiguration.h:
    * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
    * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
    (-[_WKProcessPoolConfiguration suppressesConnectionTerminationOnSystemChange]):
    (-[_WKProcessPoolConfiguration \
                setSuppressesConnectionTerminationOnSystemChange:]):
    * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
    (WebKit::WebProcessPool::platformInitializeNetworkProcess):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@232312 \
268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari606119SourceWebCorePALChangeLog">tags/Safari-606.1.19/Source/WebCore/PAL/ChangeLog</a></li>
 <li><a href="#tagsSafari606119SourceWebCorePALpalspicfCFNetworkSPIh">tags/Safari-606.1.19/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h</a></li>
 <li><a href="#tagsSafari606119SourceWebKitChangeLog">tags/Safari-606.1.19/Source/WebKit/ChangeLog</a></li>
 <li><a href="#tagsSafari606119SourceWebKitNetworkProcessNetworkProcessh">tags/Safari-606.1.19/Source/WebKit/NetworkProcess/NetworkProcess.h</a></li>
 <li><a href="#tagsSafari606119SourceWebKitNetworkProcessNetworkProcessCreationParamet \
erscpp">tags/Safari-606.1.19/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp</a></li>
 <li><a href="#tagsSafari606119SourceWebKitNetworkProcessNetworkProcessCreationParamet \
ersh">tags/Safari-606.1.19/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h</a></li>
 <li><a href="#tagsSafari606119SourceWebKitNetworkProcesscocoaNetworkProcessCocoamm">t \
ags/Safari-606.1.19/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm</a></li>
 <li><a href="#tagsSafari606119SourceWebKitNetworkProcesscocoaNetworkSessionCocoamm">t \
ags/Safari-606.1.19/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm</a></li>
 <li><a href="#tagsSafari606119SourceWebKitUIProcessAPIAPIProcessPoolConfigurationcpp" \
>tags/Safari-606.1.19/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp</a></li>
> 
<li><a href="#tagsSafari606119SourceWebKitUIProcessAPIAPIProcessPoolConfigurationh">ta \
gs/Safari-606.1.19/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h</a></li> \
<li><a href="#tagsSafari606119SourceWebKitUIProcessAPICocoa_WKProcessPoolConfiguration \
h">tags/Safari-606.1.19/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h</a></li>
 <li><a href="#tagsSafari606119SourceWebKitUIProcessAPICocoa_WKProcessPoolConfiguratio \
nmm">tags/Safari-606.1.19/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm</a></li>
 <li><a href="#tagsSafari606119SourceWebKitUIProcessCocoaWebProcessPoolCocoamm">tags/Safari-606.1.19/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
 </ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari606119SourceWebCorePALChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-606.1.19/Source/WebCore/PAL/ChangeLog \
(232340 => 232341)</h4> <pre class="diff"><span>
<span class="info">--- tags/Safari-606.1.19/Source/WebCore/PAL/ChangeLog	2018-05-31 \
                06:51:34 UTC (rev 232340)
+++ tags/Safari-606.1.19/Source/WebCore/PAL/ChangeLog	2018-05-31 07:10:48 UTC (rev \
232341) </span><span class="lines">@@ -1,3 +1,57 @@
</span><ins>+2018-05-31  Kocsen Chung  &lt;kocsen_chung@apple.com&gt;
+
+        Cherry-pick r232312. rdar://problem/39338957
+
+    [Cocoa] Add an SPI to suppress connection termination errors from CFNetwork when \
network interfaces change +    https://bugs.webkit.org/show_bug.cgi?id=186107
+    &lt;rdar://problem/39338957&gt;
+    
+    Reviewed by Brady Eidson.
+    
+    Source/WebCore/PAL:
+    
+    * pal/spi/cf/CFNetworkSPI.h: Declared new SPI.
+    
+    Source/WebKit:
+    
+    Added an SPI which configures a process pool's networking process to set the
+    kCFStreamPropertyAutoErrorOnSystemChange to NO on its \
NSURLSessionConfigurations. +    This instructs CFNetwork to not terminate active \
connections when the system's +    network interfaces change.
+    
+    * NetworkProcess/NetworkProcess.h:
+    (WebKit::NetworkProcess::suppressesConnectionTerminationOnSystemChange const):
+    * NetworkProcess/NetworkProcessCreationParameters.cpp:
+    (WebKit::NetworkProcessCreationParameters::encode const):
+    (WebKit::NetworkProcessCreationParameters::decode):
+    * NetworkProcess/NetworkProcessCreationParameters.h:
+    * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+    (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+    * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+    (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
+    * UIProcess/API/APIProcessPoolConfiguration.cpp:
+    (API::ProcessPoolConfiguration::copy):
+    * UIProcess/API/APIProcessPoolConfiguration.h:
+    * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
+    * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
+    (-[_WKProcessPoolConfiguration suppressesConnectionTerminationOnSystemChange]):
+    (-[_WKProcessPoolConfiguration \
setSuppressesConnectionTerminationOnSystemChange:]): +    * \
UIProcess/Cocoa/WebProcessPoolCocoa.mm: +    \
(WebKit::WebProcessPool::platformInitializeNetworkProcess): +    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@232312 \
268f45cc-cd09-0410-ab3c-d52691b4dbfc +
+    2018-05-30  Andy Estes  &lt;aestes@apple.com&gt;
+
+            [Cocoa] Add an SPI to suppress connection termination errors from \
CFNetwork when network interfaces change +            \
https://bugs.webkit.org/show_bug.cgi?id=186107 +            \
&lt;rdar://problem/39338957&gt; +
+            Reviewed by Brady Eidson.
+
+            * pal/spi/cf/CFNetworkSPI.h: Declared new SPI.
+
</ins><span class="cx"> 2018-05-27  Dan Bernstein  &lt;mitz@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reverted the changes made for \
https://webkit.org/b/186016 </span></span></pre></div>
<a id="tagsSafari606119SourceWebCorePALpalspicfCFNetworkSPIh"></a>
<div class="modfile"><h4>Modified: \
tags/Safari-606.1.19/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (232340 => \
232341)</h4> <pre class="diff"><span>
<span class="info">--- \
tags/Safari-606.1.19/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h	2018-05-31 06:51:34 \
                UTC (rev 232340)
+++ tags/Safari-606.1.19/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h	2018-05-31 \
07:10:48 UTC (rev 232341) </span><span class="lines">@@ -140,6 +140,9 @@
</span><span class="cx"> #if (PLATFORM(MAC) &amp;&amp; \
__MAC_OS_X_VERSION_MIN_REQUIRED &gt;= 101300) || (PLATFORM(IOS) &amp;&amp; \
__IPHONE_OS_VERSION_MIN_REQUIRED &gt;= 110000) </span><span class="cx"> @property \
(nullable, copy) NSSet *_suppressedAutoAddedHTTPHeaders; </span><span class="cx"> \
#endif </span><ins>+#if (PLATFORM(MAC) &amp;&amp; __MAC_OS_X_VERSION_MIN_REQUIRED \
&gt;= 101400) || (PLATFORM(IOS) &amp;&amp; __IPHONE_OS_VERSION_MIN_REQUIRED &gt;= \
120000) +@property (copy) NSDictionary *_socketStreamProperties;
+#endif
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> #if (PLATFORM(MAC) &amp;&amp; \
__MAC_OS_X_VERSION_MIN_REQUIRED &gt;= 101300) || (PLATFORM(IOS) &amp;&amp; \
__IPHONE_OS_VERSION_MIN_REQUIRED &gt;= 110000) </span></span></pre></div>
<a id="tagsSafari606119SourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-606.1.19/Source/WebKit/ChangeLog \
(232340 => 232341)</h4> <pre class="diff"><span>
<span class="info">--- tags/Safari-606.1.19/Source/WebKit/ChangeLog	2018-05-31 \
                06:51:34 UTC (rev 232340)
+++ tags/Safari-606.1.19/Source/WebKit/ChangeLog	2018-05-31 07:10:48 UTC (rev 232341)
</span><span class="lines">@@ -1,3 +1,80 @@
</span><ins>+2018-05-31  Kocsen Chung  &lt;kocsen_chung@apple.com&gt;
+
+        Cherry-pick r232312. rdar://problem/39338957
+
+    [Cocoa] Add an SPI to suppress connection termination errors from CFNetwork when \
network interfaces change +    https://bugs.webkit.org/show_bug.cgi?id=186107
+    &lt;rdar://problem/39338957&gt;
+    
+    Reviewed by Brady Eidson.
+    
+    Source/WebCore/PAL:
+    
+    * pal/spi/cf/CFNetworkSPI.h: Declared new SPI.
+    
+    Source/WebKit:
+    
+    Added an SPI which configures a process pool's networking process to set the
+    kCFStreamPropertyAutoErrorOnSystemChange to NO on its \
NSURLSessionConfigurations. +    This instructs CFNetwork to not terminate active \
connections when the system's +    network interfaces change.
+    
+    * NetworkProcess/NetworkProcess.h:
+    (WebKit::NetworkProcess::suppressesConnectionTerminationOnSystemChange const):
+    * NetworkProcess/NetworkProcessCreationParameters.cpp:
+    (WebKit::NetworkProcessCreationParameters::encode const):
+    (WebKit::NetworkProcessCreationParameters::decode):
+    * NetworkProcess/NetworkProcessCreationParameters.h:
+    * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+    (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+    * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+    (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
+    * UIProcess/API/APIProcessPoolConfiguration.cpp:
+    (API::ProcessPoolConfiguration::copy):
+    * UIProcess/API/APIProcessPoolConfiguration.h:
+    * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
+    * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
+    (-[_WKProcessPoolConfiguration suppressesConnectionTerminationOnSystemChange]):
+    (-[_WKProcessPoolConfiguration \
setSuppressesConnectionTerminationOnSystemChange:]): +    * \
UIProcess/Cocoa/WebProcessPoolCocoa.mm: +    \
(WebKit::WebProcessPool::platformInitializeNetworkProcess): +    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@232312 \
268f45cc-cd09-0410-ab3c-d52691b4dbfc +
+    2018-05-30  Andy Estes  &lt;aestes@apple.com&gt;
+
+            [Cocoa] Add an SPI to suppress connection termination errors from \
CFNetwork when network interfaces change +            \
https://bugs.webkit.org/show_bug.cgi?id=186107 +            \
&lt;rdar://problem/39338957&gt; +
+            Reviewed by Brady Eidson.
+
+            Added an SPI which configures a process pool's networking process to set \
the +            kCFStreamPropertyAutoErrorOnSystemChange to NO on its \
NSURLSessionConfigurations. +            This instructs CFNetwork to not terminate \
active connections when the system's +            network interfaces change.
+
+            * NetworkProcess/NetworkProcess.h:
+            (WebKit::NetworkProcess::suppressesConnectionTerminationOnSystemChange \
const): +            * NetworkProcess/NetworkProcessCreationParameters.cpp:
+            (WebKit::NetworkProcessCreationParameters::encode const):
+            (WebKit::NetworkProcessCreationParameters::decode):
+            * NetworkProcess/NetworkProcessCreationParameters.h:
+            * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+            (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+            * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+            (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
+            * UIProcess/API/APIProcessPoolConfiguration.cpp:
+            (API::ProcessPoolConfiguration::copy):
+            * UIProcess/API/APIProcessPoolConfiguration.h:
+            * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
+            * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
+            (-[_WKProcessPoolConfiguration \
suppressesConnectionTerminationOnSystemChange]): +            \
(-[_WKProcessPoolConfiguration setSuppressesConnectionTerminationOnSystemChange:]): + \
* UIProcess/Cocoa/WebProcessPoolCocoa.mm: +            \
(WebKit::WebProcessPool::platformInitializeNetworkProcess): +
</ins><span class="cx"> 2018-05-30  Kocsen Chung  &lt;kocsen_chung@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r232307. rdar://problem/40651225
</span></span></pre></div>
<a id="tagsSafari606119SourceWebKitNetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: \
tags/Safari-606.1.19/Source/WebKit/NetworkProcess/NetworkProcess.h (232340 => \
232341)</h4> <pre class="diff"><span>
<span class="info">--- \
tags/Safari-606.1.19/Source/WebKit/NetworkProcess/NetworkProcess.h	2018-05-31 \
                06:51:34 UTC (rev 232340)
+++ tags/Safari-606.1.19/Source/WebKit/NetworkProcess/NetworkProcess.h	2018-05-31 \
07:10:48 UTC (rev 232341) </span><span class="lines">@@ -115,6 +115,7 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">     RetainPtr&lt;CFDataRef&gt; sourceApplicationAuditData() \
const; </span><span class="cx">     void \
clearHSTSCache(WebCore::NetworkStorageSession&amp;, WallTime modifiedSince); \
</span><ins>+    bool suppressesConnectionTerminationOnSystemChange() const { return \
m_suppressesConnectionTerminationOnSystemChange; } </ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     void findPendingDownloadLocation(NetworkDataTask&amp;, \
ResponseCompletionHandler&amp;&amp;, const WebCore::ResourceResponse&amp;); \
</span><span class="lines">@@ -289,6 +290,8 @@ </span><span class="cx">     // \
multiple requests to clear the cache can come in before previous requests complete, \
and we need to wait for all of them. </span><span class="cx">     // In the future \
using WorkQueue and a counting semaphore would work, as would WorkQueue supporting \
the libdispatch concept of &quot;work groups&quot;. </span><span class="cx">     \
dispatch_group_t m_clearCacheDispatchGroup; </span><ins>+
+    bool m_suppressesConnectionTerminationOnSystemChange { false };
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(CONTENT_EXTENSIONS)
</span></span></pre></div>
<a id="tagsSafari606119SourceWebKitNetworkProcessNetworkProcessCreationParameterscpp"></a>
 <div class="modfile"><h4>Modified: \
tags/Safari-606.1.19/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp \
(232340 => 232341)</h4> <pre class="diff"><span>
<span class="info">--- \
tags/Safari-606.1.19/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp	2018-05-31 \
                06:51:34 UTC (rev 232340)
+++ tags/Safari-606.1.19/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp	2018-05-31 \
07:10:48 UTC (rev 232341) </span><span class="lines">@@ -78,11 +78,10 @@
</span><span class="cx"> #endif
</span><span class="cx">     encoder &lt;&lt; httpProxy;
</span><span class="cx">     encoder &lt;&lt; httpsProxy;
</span><del>-#if PLATFORM(COCOA)
</del><span class="cx">     IPC::encode(encoder, networkATSContext.get());
</span><del>-#endif
</del><span class="cx">     encoder &lt;&lt; cookieStoragePartitioningEnabled;
</span><span class="cx">     encoder &lt;&lt; storageAccessAPIEnabled;
</span><ins>+    encoder &lt;&lt; suppressesConnectionTerminationOnSystemChange;
</ins><span class="cx"> #endif
</span><span class="cx"> #if USE(SOUP)
</span><span class="cx">     encoder &lt;&lt; cookiePersistentStoragePath;
</span><span class="lines">@@ -209,14 +208,14 @@
</span><span class="cx">         return false;
</span><span class="cx">     if (!decoder.decode(result.httpsProxy))
</span><span class="cx">         return false;
</span><del>-#if PLATFORM(COCOA)
</del><span class="cx">     if (!IPC::decode(decoder, result.networkATSContext))
</span><span class="cx">         return false;
</span><del>-#endif
</del><span class="cx">     if \
(!decoder.decode(result.cookieStoragePartitioningEnabled)) </span><span class="cx">   \
return false; </span><span class="cx">     if \
(!decoder.decode(result.storageAccessAPIEnabled)) </span><span class="cx">         \
return false; </span><ins>+    if \
(!decoder.decode(result.suppressesConnectionTerminationOnSystemChange)) +        \
return false; </ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if USE(SOUP)
</span></span></pre></div>
<a id="tagsSafari606119SourceWebKitNetworkProcessNetworkProcessCreationParametersh"></a>
 <div class="modfile"><h4>Modified: \
tags/Safari-606.1.19/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h \
(232340 => 232341)</h4> <pre class="diff"><span>
<span class="info">--- \
tags/Safari-606.1.19/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h	2018-05-31 \
                06:51:34 UTC (rev 232340)
+++ tags/Safari-606.1.19/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h	2018-05-31 \
07:10:48 UTC (rev 232341) </span><span class="lines">@@ -90,11 +90,10 @@
</span><span class="cx"> #endif
</span><span class="cx">     String httpProxy;
</span><span class="cx">     String httpsProxy;
</span><del>-#if PLATFORM(COCOA)
</del><span class="cx">     RetainPtr&lt;CFDataRef&gt; networkATSContext;
</span><del>-#endif
</del><span class="cx">     bool cookieStoragePartitioningEnabled;
</span><span class="cx">     bool storageAccessAPIEnabled;
</span><ins>+    bool suppressesConnectionTerminationOnSystemChange;
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #if USE(SOUP)
</span></span></pre></div>
<a id="tagsSafari606119SourceWebKitNetworkProcesscocoaNetworkProcessCocoamm"></a>
<div class="modfile"><h4>Modified: \
tags/Safari-606.1.19/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm \
(232340 => 232341)</h4> <pre class="diff"><span>
<span class="info">--- \
tags/Safari-606.1.19/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm	2018-05-31 \
                06:51:34 UTC (rev 232340)
+++ tags/Safari-606.1.19/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm	2018-05-31 \
07:10:48 UTC (rev 232341) </span><span class="lines">@@ -101,6 +101,7 @@
</span><span class="cx"> 
</span><span class="cx">     \
WebCore::NetworkStorageSession::setCookieStoragePartitioningEnabled(parameters.cookieStoragePartitioningEnabled);
 </span><span class="cx">     \
WebCore::NetworkStorageSession::setStorageAccessAPIEnabled(parameters.storageAccessAPIEnabled);
 </span><ins>+    m_suppressesConnectionTerminationOnSystemChange = \
parameters.suppressesConnectionTerminationOnSystemChange; </ins><span class="cx"> 
</span><span class="cx">     // FIXME: Most of what this function does for cache size \
gets immediately overridden by setCacheModel(). </span><span class="cx">     // - \
memory cache size passed from UI process is always ignored; </span><span \
class="lines">@@ -140,7 +141,6 @@ </span><span class="cx">     // Disable NSURLCache.
</span><span class="cx">     auto urlCache(adoptNS([[NSURLCache alloc] \
initWithMemoryCapacity:0 diskCapacity:0 diskPath:nil])); </span><span class="cx">     \
[NSURLCache setSharedURLCache:urlCache.get()]; </span><del>-    return;
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> RetainPtr&lt;CFDataRef&gt; \
NetworkProcess::sourceApplicationAuditData() const </span></span></pre></div>
<a id="tagsSafari606119SourceWebKitNetworkProcesscocoaNetworkSessionCocoamm"></a>
<div class="modfile"><h4>Modified: \
tags/Safari-606.1.19/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm \
(232340 => 232341)</h4> <pre class="diff"><span>
<span class="info">--- \
tags/Safari-606.1.19/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm	2018-05-31 \
                06:51:34 UTC (rev 232340)
+++ tags/Safari-606.1.19/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm	2018-05-31 \
07:10:48 UTC (rev 232341) </span><span class="lines">@@ -54,9 +54,10 @@
</span><span class="cx"> 
</span><span class="cx"> using namespace WebKit;
</span><span class="cx"> 
</span><del>-#if (PLATFORM(MAC) &amp;&amp; __MAC_OS_X_VERSION_MIN_REQUIRED &gt;= \
101300) || (PLATFORM(IOS) &amp;&amp; __IPHONE_OS_VERSION_MIN_REQUIRED &gt;= 110000) \
</del><ins>+#if (PLATFORM(MAC) &amp;&amp; __MAC_OS_X_VERSION_MIN_REQUIRED &gt;= \
101400) || (PLATFORM(IOS) &amp;&amp; __IPHONE_OS_VERSION_MIN_REQUIRED &gt;= 120000) \
+// FIXME: Remove this once rdar://problem/40650244 is in a build. </ins><span \
class="cx"> @interface NSURLSessionConfiguration (WKStaging) </span><del>-@property \
(nullable, copy) NSSet *_suppressedAutoAddedHTTPHeaders; </del><ins>+@property (copy) \
NSDictionary *_socketStreamProperties; </ins><span class="cx"> @end
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="lines">@@ -701,6 +702,12 @@
</span><span class="cx">     setCollectsTimingData();
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if (PLATFORM(MAC) &amp;&amp; __MAC_OS_X_VERSION_MIN_REQUIRED &gt;= \
101400) || (PLATFORM(IOS) &amp;&amp; __IPHONE_OS_VERSION_MIN_REQUIRED &gt;= 120000) + \
// FIXME: Replace @&quot;kCFStreamPropertyAutoErrorOnSystemChange&quot; with a \
constant from the SDK once rdar://problem/40650244 is in a build. +    if \
(NetworkProcess::singleton().suppressesConnectionTerminationOnSystemChange()) +       \
configuration._socketStreamProperties = @{ \
@&quot;kCFStreamPropertyAutoErrorOnSystemChange&quot; : @(NO) }; +#endif
+
</ins><span class="cx">     auto* storageSession = \
WebCore::NetworkStorageSession::storageSession(parameters.sessionID); </span><span \
class="cx">     RELEASE_ASSERT(storageSession); </span><span class="cx">     if \
(CFHTTPCookieStorageRef storage = storageSession-&gt;cookieStorage().get()) \
</span></span></pre></div> <a \
id="tagsSafari606119SourceWebKitUIProcessAPIAPIProcessPoolConfigurationcpp"></a> <div \
class="modfile"><h4>Modified: \
tags/Safari-606.1.19/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp \
(232340 => 232341)</h4> <pre class="diff"><span>
<span class="info">--- \
tags/Safari-606.1.19/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp	2018-05-31 \
                06:51:34 UTC (rev 232340)
+++ tags/Safari-606.1.19/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp	2018-05-31 \
07:10:48 UTC (rev 232341) </span><span class="lines">@@ -134,6 +134,9 @@
</span><span class="cx"> #if ENABLE(WIFI_ASSERTIONS)
</span><span class="cx">     copy-&gt;m_wirelessContextIdentifier = \
this-&gt;m_wirelessContextIdentifier; </span><span class="cx"> #endif
</span><ins>+#if PLATFORM(COCOA)
+    copy-&gt;m_suppressesConnectionTerminationOnSystemChange = \
this-&gt;m_suppressesConnectionTerminationOnSystemChange; +#endif
</ins><span class="cx"> 
</span><span class="cx">     return copy;
</span><span class="cx"> }
</span></span></pre></div>
<a id="tagsSafari606119SourceWebKitUIProcessAPIAPIProcessPoolConfigurationh"></a>
<div class="modfile"><h4>Modified: \
tags/Safari-606.1.19/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h \
(232340 => 232341)</h4> <pre class="diff"><span>
<span class="info">--- \
tags/Safari-606.1.19/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h	2018-05-31 \
                06:51:34 UTC (rev 232340)
+++ tags/Safari-606.1.19/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h	2018-05-31 \
07:10:48 UTC (rev 232341) </span><span class="lines">@@ -152,6 +152,11 @@
</span><span class="cx">     void setWirelessContextIdentifier(unsigned \
wirelessContextIdentifier) { m_wirelessContextIdentifier = wirelessContextIdentifier; \
} </span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#if PLATFORM(COCOA)
+    bool suppressesConnectionTerminationOnSystemChange() const { return \
m_suppressesConnectionTerminationOnSystemChange; } +    void \
setSuppressesConnectionTerminationOnSystemChange(bool \
suppressesConnectionTerminationOnSystemChange) { \
m_suppressesConnectionTerminationOnSystemChange = \
suppressesConnectionTerminationOnSystemChange; } +#endif
+
</ins><span class="cx"> private:
</span><span class="cx">     bool m_shouldHaveLegacyDataStore { false };
</span><span class="cx"> 
</span><span class="lines">@@ -195,6 +200,10 @@
</span><span class="cx"> #if ENABLE(WIFI_ASSERTIONS)
</span><span class="cx">     unsigned m_wirelessContextIdentifier { 0 };
</span><span class="cx"> #endif
</span><ins>+
+#if PLATFORM(COCOA)
+    bool m_suppressesConnectionTerminationOnSystemChange { false };
+#endif
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace API
</span></span></pre></div>
<a id="tagsSafari606119SourceWebKitUIProcessAPICocoa_WKProcessPoolConfigurationh"></a>
 <div class="modfile"><h4>Modified: \
tags/Safari-606.1.19/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h \
(232340 => 232341)</h4> <pre class="diff"><span>
<span class="info">--- \
tags/Safari-606.1.19/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h	2018-05-31 \
                06:51:34 UTC (rev 232340)
+++ tags/Safari-606.1.19/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h	2018-05-31 \
07:10:48 UTC (rev 232341) </span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx"> @property (nonatomic) BOOL \
processSwapsOnWindowOpenWithOpener WK_API_AVAILABLE(macosx(WK_MAC_TBA), \
ios(WK_IOS_TBA)); </span><span class="cx"> @property (nonatomic) BOOL \
tracksResourceLoadMilestones WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA)); \
</span><span class="cx"> @property (nonatomic) BOOL pageCacheEnabled \
WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA)); </span><ins>+@property \
(nonatomic) BOOL suppressesConnectionTerminationOnSystemChange \
WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA)); </ins><span class="cx"> 
</span><span class="cx"> @end
</span><span class="cx"> 
</span></span></pre></div>
<a id="tagsSafari606119SourceWebKitUIProcessAPICocoa_WKProcessPoolConfigurationmm"></a>
 <div class="modfile"><h4>Modified: \
tags/Safari-606.1.19/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm \
(232340 => 232341)</h4> <pre class="diff"><span>
<span class="info">--- \
tags/Safari-606.1.19/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm	2018-05-31 \
                06:51:34 UTC (rev 232340)
+++ tags/Safari-606.1.19/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm	2018-05-31 \
07:10:48 UTC (rev 232341) </span><span class="lines">@@ -292,6 +292,16 @@
</span><span class="cx">         \
_processPoolConfiguration-&gt;setCacheModel(WebKit::CacheModelPrimaryWebBrowser); \
</span><span class="cx"> } </span><span class="cx"> 
</span><ins>+- (BOOL)suppressesConnectionTerminationOnSystemChange
+{
+    return _processPoolConfiguration-&gt;suppressesConnectionTerminationOnSystemChange();
 +}
+
+- (void)setSuppressesConnectionTerminationOnSystemChange:(BOOL)suppressesConnectionTerminationOnSystemChange
 +{
+    _processPoolConfiguration-&gt;setSuppressesConnectionTerminationOnSystemChange(suppressesConnectionTerminationOnSystemChange);
 +}
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> - (NSString *)CTDataConnectionServiceType
</span><span class="cx"> {
</span></span></pre></div>
<a id="tagsSafari606119SourceWebKitUIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: \
tags/Safari-606.1.19/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (232340 => \
232341)</h4> <pre class="diff"><span>
<span class="info">--- \
tags/Safari-606.1.19/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm	2018-05-31 \
                06:51:34 UTC (rev 232340)
+++ tags/Safari-606.1.19/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm	2018-05-31 \
07:10:48 UTC (rev 232341) </span><span class="lines">@@ -318,6 +318,7 @@
</span><span class="cx"> 
</span><span class="cx">     parameters.cookieStoragePartitioningEnabled = \
cookieStoragePartitioningEnabled(); </span><span class="cx">     \
parameters.storageAccessAPIEnabled = storageAccessAPIEnabled(); </span><ins>+    \
parameters.suppressesConnectionTerminationOnSystemChange = \
m_configuration-&gt;suppressesConnectionTerminationOnSystemChange(); </ins><span \
class="cx">  </span><span class="cx"> #if HAVE(CFNETWORK_STORAGE_PARTITIONING) \
&amp;&amp; !RELEASE_LOG_DISABLED </span><span class="cx">     \
parameters.logCookieInformation = [defaults \
boolForKey:WebKitLogCookieInformationDefaultsKey]; </span></span></pre>
</div>
</div>

</body>
</html>


_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes


[prev in list] [next in list] [prev in thread] [next in thread]