<!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>[207131] releases/WebKitGTK/webkit-2.14/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/207131">207131</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-11 06:52:21 -0700 (Tue, 11 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/206772">r206772</a> - [SOUP] Remove SSLPolicyFlags from SoupNetworkSession
https://bugs.webkit.org/show_bug.cgi?id=162906
Patch by Carlos Garcia Campos <cgarcia@igalia.com> on 2016-10-04
Reviewed by Michael Catanzaro.
Source/WebCore:
All soup based ports are setting SSLUseSystemCAFile flag unconditionally, so we can just use that when creating
the session like we do for all other construct parameters.
* platform/network/soup/SoupNetworkSession.cpp:
(WebCore::SoupNetworkSession::createTestingSession):
(WebCore::SoupNetworkSession::setupLogger):
(WebCore::SoupNetworkSession::SoupNetworkSession): Deleted.
(WebCore::SoupNetworkSession::clearOldSoupCache): Deleted.
(WebCore::SoupNetworkSession::setHTTPProxy): Deleted.
* platform/network/soup/SoupNetworkSession.h:
(WebCore::SoupNetworkSession::soupSession): Deleted.
Source/WebKit2:
* NetworkProcess/soup/NetworkProcessMainSoup.cpp:
(WebKit::NetworkProcessMainUnix):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformnetworksoupSoupNetworkSessioncpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreplatformnetworksoupSoupNetworkSessionh">releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/network/soup/SoupNetworkSession.h</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebKit2NetworkProcesssoupNetworkProcessMainSoupcpp">releases/WebKitGTK/webkit-2.14/Source/WebKit2/NetworkProcess/soup/NetworkProcessMainSoup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (207130 => 207131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-11 13:50:31 UTC (rev 207130)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-11 13:52:21 UTC (rev 207131)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-10-04 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [SOUP] Remove SSLPolicyFlags from SoupNetworkSession
+ https://bugs.webkit.org/show_bug.cgi?id=162906
+
+ Reviewed by Michael Catanzaro.
+
+ All soup based ports are setting SSLUseSystemCAFile flag unconditionally, so we can just use that when creating
+ the session like we do for all other construct parameters.
+
+ * platform/network/soup/SoupNetworkSession.cpp:
+ (WebCore::SoupNetworkSession::createTestingSession):
+ (WebCore::SoupNetworkSession::setupLogger):
+ (WebCore::SoupNetworkSession::SoupNetworkSession): Deleted.
+ (WebCore::SoupNetworkSession::clearOldSoupCache): Deleted.
+ (WebCore::SoupNetworkSession::setHTTPProxy): Deleted.
+ * platform/network/soup/SoupNetworkSession.h:
+ (WebCore::SoupNetworkSession::soupSession): Deleted.
+
</ins><span class="cx"> 2016-10-03 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Avoid null dereference when changing focus in design mode.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformnetworksoupSoupNetworkSessioncpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp (207130 => 207131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp 2016-10-11 13:50:31 UTC (rev 207130)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp 2016-10-11 13:52:21 UTC (rev 207131)
</span><span class="lines">@@ -108,6 +108,8 @@
</span><span class="cx"> SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_PROXY_RESOLVER_DEFAULT,
</span><span class="cx"> SOUP_SESSION_ADD_FEATURE, cookieJar,
</span><span class="cx"> SOUP_SESSION_USE_THREAD_CONTEXT, TRUE,
</span><ins>+ SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE,
+ SOUP_SESSION_SSL_STRICT, FALSE,
</ins><span class="cx"> nullptr);
</span><span class="cx">
</span><span class="cx"> #if SOUP_CHECK_VERSION(2, 53, 92)
</span><span class="lines">@@ -203,30 +205,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SoupNetworkSession::setSSLPolicy(SSLPolicy flags)
-{
- g_object_set(m_soupSession.get(),
- SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, flags & SSLUseSystemCAFile ? TRUE : FALSE,
- SOUP_SESSION_SSL_STRICT, flags & SSLStrict ? TRUE : FALSE,
- nullptr);
-}
-
-SoupNetworkSession::SSLPolicy SoupNetworkSession::sslPolicy() const
-{
- gboolean useSystemCAFile, strict;
- g_object_get(m_soupSession.get(),
- SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, &useSystemCAFile,
- SOUP_SESSION_SSL_STRICT, &strict,
- nullptr);
-
- SSLPolicy flags = 0;
- if (useSystemCAFile)
- flags |= SSLUseSystemCAFile;
- if (strict)
- flags |= SSLStrict;
- return flags;
-}
-
</del><span class="cx"> void SoupNetworkSession::setHTTPProxy(const char* httpProxy, const char* httpProxyExceptions)
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(EFL)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreplatformnetworksoupSoupNetworkSessionh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/network/soup/SoupNetworkSession.h (207130 => 207131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/network/soup/SoupNetworkSession.h 2016-10-11 13:50:31 UTC (rev 207130)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/network/soup/SoupNetworkSession.h 2016-10-11 13:52:21 UTC (rev 207131)
</span><span class="lines">@@ -47,12 +47,6 @@
</span><span class="cx"> static std::unique_ptr<SoupNetworkSession> createTestingSession();
</span><span class="cx"> static std::unique_ptr<SoupNetworkSession> createForSoupSession(SoupSession*);
</span><span class="cx">
</span><del>- enum SSLPolicyFlags {
- SSLStrict = 1 << 0,
- SSLUseSystemCAFile = 1 << 1
- };
- typedef unsigned SSLPolicy;
-
</del><span class="cx"> SoupSession* soupSession() const { return m_soupSession.get(); }
</span><span class="cx">
</span><span class="cx"> void setCookieJar(SoupCookieJar*);
</span><span class="lines">@@ -62,9 +56,6 @@
</span><span class="cx"> SoupCache* cache() const;
</span><span class="cx"> static void clearCache(const String& cacheDirectory);
</span><span class="cx">
</span><del>- void setSSLPolicy(SSLPolicy);
- SSLPolicy sslPolicy() const;
-
</del><span class="cx"> void setupHTTPProxyFromEnvironment();
</span><span class="cx">
</span><span class="cx"> void setAcceptLanguages(const Vector<String>&);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog (207130 => 207131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2016-10-11 13:50:31 UTC (rev 207130)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/ChangeLog 2016-10-11 13:52:21 UTC (rev 207131)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-10-04 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [SOUP] Remove SSLPolicyFlags from SoupNetworkSession
+ https://bugs.webkit.org/show_bug.cgi?id=162906
+
+ Reviewed by Michael Catanzaro.
+
+ * NetworkProcess/soup/NetworkProcessMainSoup.cpp:
+ (WebKit::NetworkProcessMainUnix):
+
</ins><span class="cx"> 2016-09-27 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Unreviewed typo fix
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebKit2NetworkProcesssoupNetworkProcessMainSoupcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebKit2/NetworkProcess/soup/NetworkProcessMainSoup.cpp (207130 => 207131)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebKit2/NetworkProcess/soup/NetworkProcessMainSoup.cpp 2016-10-11 13:50:31 UTC (rev 207130)
+++ releases/WebKitGTK/webkit-2.14/Source/WebKit2/NetworkProcess/soup/NetworkProcessMainSoup.cpp 2016-10-11 13:52:21 UTC (rev 207131)
</span><span class="lines">@@ -29,25 +29,12 @@
</span><span class="cx">
</span><span class="cx"> #include "ChildProcessMain.h"
</span><span class="cx"> #include "NetworkProcessMainUnix.h"
</span><del>-#include <WebCore/SoupNetworkSession.h>
-#include <libsoup/soup.h>
</del><span class="cx">
</span><del>-using namespace WebCore;
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-class NetworkProcessMain final: public ChildProcessMainBase {
-public:
- bool platformInitialize() override
- {
- SoupNetworkSession::defaultSession().setSSLPolicy(SoupNetworkSession::SSLUseSystemCAFile);
- return true;
- }
-};
-
</del><span class="cx"> int NetworkProcessMainUnix(int argc, char** argv)
</span><span class="cx"> {
</span><del>- return ChildProcessMain<NetworkProcess, NetworkProcessMain>(argc, argv);
</del><ins>+ return ChildProcessMain<NetworkProcess, ChildProcessMainBase>(argc, argv);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>