<!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>[206807] trunk/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/206807">206807</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-05 02:43:28 -0700 (Wed, 05 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[SOUP] Move global TLS errors handling from ResourceHandle to SoupNetworkSession
https://bugs.webkit.org/show_bug.cgi?id=162910
Reviewed by Alex Christensen.
Source/WebCore:
So that it will be shared with network session code. Also remove setHostAllowsAnyHTTPSCertificate() that we have
never actually used.
* platform/network/ResourceHandle.h:
* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::tlsErrorsChangedCallback): Use SoupNetworkSession::checkTLSErrors().
* platform/network/soup/SoupNetworkSession.cpp:
(WebCore::HostTLSCertificateSet::add):
(WebCore::HostTLSCertificateSet::contains):
(WebCore::HostTLSCertificateSet::computeCertificateHash):
(WebCore::clientCertificates):
(WebCore::SoupNetworkSession::setShouldIgnoreTLSErrors):
(WebCore::SoupNetworkSession::checkTLSErrors):
(WebCore::SoupNetworkSession::allowSpecificHTTPSCertificateForHost):
* platform/network/soup/SoupNetworkSession.h:
Source/WebKit2:
Use SoupNetworkSession instead of ResourceHandle.
* NetworkProcess/soup/NetworkProcessSoup.cpp:
(WebKit::NetworkProcess::setIgnoreTLSErrors):
(WebKit::NetworkProcess::allowSpecificHTTPSCertificateForHost):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleh">trunk/Source/WebCore/platform/network/ResourceHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSoupNetworkSessioncpp">trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSoupNetworkSessionh">trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesssoupNetworkProcessSoupcpp">trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206806 => 206807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-05 09:23:52 UTC (rev 206806)
+++ trunk/Source/WebCore/ChangeLog 2016-10-05 09:43:28 UTC (rev 206807)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2016-10-05 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [SOUP] Move global TLS errors handling from ResourceHandle to SoupNetworkSession
+ https://bugs.webkit.org/show_bug.cgi?id=162910
+
+ Reviewed by Alex Christensen.
+
+ So that it will be shared with network session code. Also remove setHostAllowsAnyHTTPSCertificate() that we have
+ never actually used.
+
+ * platform/network/ResourceHandle.h:
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::tlsErrorsChangedCallback): Use SoupNetworkSession::checkTLSErrors().
+ * platform/network/soup/SoupNetworkSession.cpp:
+ (WebCore::HostTLSCertificateSet::add):
+ (WebCore::HostTLSCertificateSet::contains):
+ (WebCore::HostTLSCertificateSet::computeCertificateHash):
+ (WebCore::clientCertificates):
+ (WebCore::SoupNetworkSession::setShouldIgnoreTLSErrors):
+ (WebCore::SoupNetworkSession::checkTLSErrors):
+ (WebCore::SoupNetworkSession::allowSpecificHTTPSCertificateForHost):
+ * platform/network/soup/SoupNetworkSession.h:
+
+2016-10-05 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [SOUP] Move request HTTP body handling to ResourceRequestSoup and simplify it
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=162891
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandle.h (206806 => 206807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandle.h 2016-10-05 09:23:52 UTC (rev 206806)
+++ trunk/Source/WebCore/platform/network/ResourceHandle.h 2016-10-05 09:43:28 UTC (rev 206807)
</span><span class="lines">@@ -185,9 +185,6 @@
</span><span class="cx"> void ensureReadBuffer();
</span><span class="cx"> size_t currentStreamPosition() const;
</span><span class="cx"> void didStartRequest();
</span><del>- static void setHostAllowsAnyHTTPSCertificate(const String&);
- static void setClientCertificate(const String& host, GTlsCertificate*);
- static void setIgnoreSSLErrors(bool);
</del><span class="cx"> double m_requestTime;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (206806 => 206807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2016-10-05 09:23:52 UTC (rev 206806)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2016-10-05 09:43:28 UTC (rev 206807)
</span><span class="lines">@@ -58,9 +58,7 @@
</span><span class="cx"> #include <unistd.h>
</span><span class="cx"> #endif
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><del>-#include <wtf/SHA1.h>
</del><span class="cx"> #include <wtf/glib/GRefPtr.h>
</span><del>-#include <wtf/text/Base64.h>
</del><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -67,40 +65,6 @@
</span><span class="cx">
</span><span class="cx"> static const size_t gDefaultReadBufferSize = 8192;
</span><span class="cx">
</span><del>-class HostTLSCertificateSet {
-public:
- void add(GTlsCertificate* certificate)
- {
- String certificateHash = computeCertificateHash(certificate);
- if (!certificateHash.isEmpty())
- m_certificates.add(certificateHash);
- }
-
- bool contains(GTlsCertificate* certificate)
- {
- return m_certificates.contains(computeCertificateHash(certificate));
- }
-
-private:
- static String computeCertificateHash(GTlsCertificate* certificate)
- {
- GRefPtr<GByteArray> certificateData;
- g_object_get(G_OBJECT(certificate), "certificate", &certificateData.outPtr(), NULL);
- if (!certificateData)
- return String();
-
- SHA1 sha1;
- sha1.addBytes(certificateData->data, certificateData->len);
-
- SHA1::Digest digest;
- sha1.computeHash(digest);
-
- return base64Encode(reinterpret_cast<const char*>(digest.data()), SHA1::hashSize);
- }
-
- HashSet<String> m_certificates;
-};
-
</del><span class="cx"> static bool createSoupRequestAndMessageForHandle(ResourceHandle*, const ResourceRequest&);
</span><span class="cx"> static void cleanupSoupRequestOperation(ResourceHandle*, bool isDestroying = false);
</span><span class="cx"> static void sendRequestCallback(GObject*, GAsyncResult*, gpointer);
</span><span class="lines">@@ -110,22 +74,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> static void continueAfterDidReceiveResponse(ResourceHandle*);
</span><span class="cx">
</span><del>-static bool gIgnoreSSLErrors = false;
-
-typedef HashSet<String, ASCIICaseInsensitiveHash> HostsSet;
-static HostsSet& allowsAnyHTTPSCertificateHosts()
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(HostsSet, hosts, ());
- return hosts;
-}
-
-typedef HashMap<String, HostTLSCertificateSet, ASCIICaseInsensitiveHash> CertificatesMap;
-static CertificatesMap& clientCertificates()
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(CertificatesMap, certificates, ());
- return certificates;
-}
-
</del><span class="cx"> ResourceHandleInternal::~ResourceHandleInternal()
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -180,31 +128,6 @@
</span><span class="cx"> return httpStatusCode == SOUP_STATUS_PROXY_AUTHENTICATION_REQUIRED || httpStatusCode == SOUP_STATUS_UNAUTHORIZED;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool handleUnignoredTLSErrors(ResourceHandle* handle, SoupMessage* message)
-{
- if (gIgnoreSSLErrors)
- return false;
-
- GTlsCertificate* certificate = nullptr;
- GTlsCertificateFlags tlsErrors = static_cast<GTlsCertificateFlags>(0);
- soup_message_get_https_status(message, &certificate, &tlsErrors);
- if (!tlsErrors)
- return false;
-
- String host = handle->firstRequest().url().host();
- if (allowsAnyHTTPSCertificateHosts().contains(host))
- return false;
-
- // We aren't ignoring errors globally, but the user may have already decided to accept this certificate.
- auto it = clientCertificates().find(host);
- if (it != clientCertificates().end() && it->value.contains(certificate))
- return false;
-
- ResourceHandleInternal* d = handle->getInternal();
- handle->client()->didFail(handle, ResourceError::tlsError(d->m_soupRequest.get(), tlsErrors, certificate));
- return true;
-}
-
</del><span class="cx"> static void tlsErrorsChangedCallback(SoupMessage* message, GParamSpec*, gpointer data)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ResourceHandle> handle = static_cast<ResourceHandle*>(data);
</span><span class="lines">@@ -211,8 +134,13 @@
</span><span class="cx"> if (!handle || handle->cancelledOrClientless())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (handleUnignoredTLSErrors(handle.get(), message))
</del><ins>+ SoupNetworkSession::checkTLSErrors(handle->getInternal()->m_soupRequest.get(), message, [handle] (const ResourceError& error) {
+ if (error.isNull())
+ return;
+
+ handle->client()->didFail(handle.get(), error);
</ins><span class="cx"> handle->cancel();
</span><ins>+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void gotHeadersCallback(SoupMessage* message, gpointer data)
</span><span class="lines">@@ -848,21 +776,6 @@
</span><span class="cx"> return (!client() || client()->shouldUseCredentialStorage(this)) && firstRequest().url().protocolIsInHTTPFamily();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ResourceHandle::setHostAllowsAnyHTTPSCertificate(const String& host)
-{
- allowsAnyHTTPSCertificateHosts().add(host);
-}
-
-void ResourceHandle::setClientCertificate(const String& host, GTlsCertificate* certificate)
-{
- clientCertificates().add(host, HostTLSCertificateSet()).iterator->value.add(certificate);
-}
-
-void ResourceHandle::setIgnoreSSLErrors(bool ignoreSSLErrors)
-{
- gIgnoreSSLErrors = ignoreSSLErrors;
-}
-
</del><span class="cx"> void ResourceHandle::continueDidReceiveAuthenticationChallenge(const Credential& credentialFromPersistentStorage)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!d->m_currentWebChallenge.isNull());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSoupNetworkSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp (206806 => 206807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp 2016-10-05 09:23:52 UTC (rev 206806)
+++ trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp 2016-10-05 09:43:28 UTC (rev 206807)
</span><span class="lines">@@ -37,12 +37,17 @@
</span><span class="cx"> #include "ResourceHandle.h"
</span><span class="cx"> #include <glib/gstdio.h>
</span><span class="cx"> #include <libsoup/soup.h>
</span><ins>+#include <wtf/HashSet.h>
</ins><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><ins>+#include <wtf/SHA1.h>
+#include <wtf/text/Base64.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+static bool gIgnoreTLSErrors;
+
</ins><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> inline static void soupLogPrinter(SoupLogger*, SoupLoggerLogLevel, char direction, const char* data, gpointer)
</span><span class="cx"> {
</span><span class="lines">@@ -50,6 +55,46 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+class HostTLSCertificateSet {
+public:
+ void add(GTlsCertificate* certificate)
+ {
+ String certificateHash = computeCertificateHash(certificate);
+ if (!certificateHash.isEmpty())
+ m_certificates.add(certificateHash);
+ }
+
+ bool contains(GTlsCertificate* certificate) const
+ {
+ return m_certificates.contains(computeCertificateHash(certificate));
+ }
+
+private:
+ static String computeCertificateHash(GTlsCertificate* certificate)
+ {
+ GRefPtr<GByteArray> certificateData;
+ g_object_get(G_OBJECT(certificate), "certificate", &certificateData.outPtr(), nullptr);
+ if (!certificateData)
+ return String();
+
+ SHA1 sha1;
+ sha1.addBytes(certificateData->data, certificateData->len);
+
+ SHA1::Digest digest;
+ sha1.computeHash(digest);
+
+ return base64Encode(reinterpret_cast<const char*>(digest.data()), SHA1::hashSize);
+ }
+
+ HashSet<String> m_certificates;
+};
+
+static HashMap<String, HostTLSCertificateSet, ASCIICaseInsensitiveHash>& clientCertificates()
+{
+ static NeverDestroyed<HashMap<String, HostTLSCertificateSet, ASCIICaseInsensitiveHash>> certificates;
+ return certificates;
+}
+
</ins><span class="cx"> SoupNetworkSession& SoupNetworkSession::defaultSession()
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<SoupNetworkSession> networkSession(soupCookieJar());
</span><span class="lines">@@ -279,6 +324,41 @@
</span><span class="cx"> g_object_set(m_soupSession.get(), "accept-language", buildAcceptLanguages(languages).data(), nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void SoupNetworkSession::setShouldIgnoreTLSErrors(bool ignoreTLSErrors)
+{
+ gIgnoreTLSErrors = ignoreTLSErrors;
+}
+
+void SoupNetworkSession::checkTLSErrors(SoupRequest* soupRequest, SoupMessage* message, std::function<void (const ResourceError&)>&& completionHandler)
+{
+ if (gIgnoreTLSErrors) {
+ completionHandler({ });
+ return;
+ }
+
+ GTlsCertificate* certificate = nullptr;
+ GTlsCertificateFlags tlsErrors = static_cast<GTlsCertificateFlags>(0);
+ soup_message_get_https_status(message, &certificate, &tlsErrors);
+ if (!tlsErrors) {
+ completionHandler({ });
+ return;
+ }
+
+ URL url(soup_request_get_uri(soupRequest));
+ auto it = clientCertificates().find(url.host());
+ if (it != clientCertificates().end() && it->value.contains(certificate)) {
+ completionHandler({ });
+ return;
+ }
+
+ completionHandler(ResourceError::tlsError(soupRequest, tlsErrors, certificate));
+}
+
+void SoupNetworkSession::allowSpecificHTTPSCertificateForHost(const CertificateInfo& certificateInfo, const String& host)
+{
+ clientCertificates().add(host, HostTLSCertificateSet()).iterator->value.add(certificateInfo.certificate());
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSoupNetworkSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h (206806 => 206807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h 2016-10-05 09:23:52 UTC (rev 206806)
+++ trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h 2016-10-05 09:43:28 UTC (rev 206807)
</span><span class="lines">@@ -33,10 +33,15 @@
</span><span class="cx">
</span><span class="cx"> typedef struct _SoupCache SoupCache;
</span><span class="cx"> typedef struct _SoupCookieJar SoupCookieJar;
</span><ins>+typedef struct _SoupMessage SoupMessage;
+typedef struct _SoupRequest SoupRequest;
</ins><span class="cx"> typedef struct _SoupSession SoupSession;
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class CertificateInfo;
+class ResourceError;
+
</ins><span class="cx"> class SoupNetworkSession {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(SoupNetworkSession); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="lines">@@ -58,6 +63,10 @@
</span><span class="cx">
</span><span class="cx"> void setAcceptLanguages(const Vector<String>&);
</span><span class="cx">
</span><ins>+ static void setShouldIgnoreTLSErrors(bool);
+ static void checkTLSErrors(SoupRequest*, SoupMessage*, std::function<void (const ResourceError&)>&&);
+ static void allowSpecificHTTPSCertificateForHost(const CertificateInfo&, const String& host);
+
</ins><span class="cx"> private:
</span><span class="cx"> friend class NeverDestroyed<SoupNetworkSession>;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (206806 => 206807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-10-05 09:23:52 UTC (rev 206806)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-05 09:43:28 UTC (rev 206807)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2016-10-05 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [SOUP] Move global TLS errors handling from ResourceHandle to SoupNetworkSession
+ https://bugs.webkit.org/show_bug.cgi?id=162910
+
+ Reviewed by Alex Christensen.
+
+ Use SoupNetworkSession instead of ResourceHandle.
+
+ * NetworkProcess/soup/NetworkProcessSoup.cpp:
+ (WebKit::NetworkProcess::setIgnoreTLSErrors):
+ (WebKit::NetworkProcess::allowSpecificHTTPSCertificateForHost):
+
+2016-10-05 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> Unreviewed. Fix GTK+ build with USE_REDIRECTED_XCOMPOSITE_WINDOW disabled.
</span><span class="cx">
</span><span class="cx"> * UIProcess/AcceleratedDrawingAreaProxy.cpp:
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesssoupNetworkProcessSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp (206806 => 206807)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp 2016-10-05 09:23:52 UTC (rev 206806)
+++ trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp 2016-10-05 09:43:28 UTC (rev 206807)
</span><span class="lines">@@ -83,12 +83,12 @@
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::setIgnoreTLSErrors(bool ignoreTLSErrors)
</span><span class="cx"> {
</span><del>- ResourceHandle::setIgnoreSSLErrors(ignoreTLSErrors);
</del><ins>+ SoupNetworkSession::setShouldIgnoreTLSErrors(ignoreTLSErrors);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::allowSpecificHTTPSCertificateForHost(const CertificateInfo& certificateInfo, const String& host)
</span><span class="cx"> {
</span><del>- ResourceHandle::setClientCertificate(host, certificateInfo.certificate());
</del><ins>+ SoupNetworkSession::allowSpecificHTTPSCertificateForHost(certificateInfo, host);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::clearCacheForAllOrigins(uint32_t cachesToClear)
</span></span></pre>
</div>
</div>
</body>
</html>